[eq-commit] [Eyescale/Equalizer] 400dbe: Merge branch 'master' of https://github.com/Eyesca...
Brought to you by:
eile
Menu
▾
▴
[eq-commit] [Eyescale/Equalizer] 400dbe: Merge branch 'master' of https://github.com/Eyesca...
|
From: GitHub <no...@gi...> - 2012-11-29 13:47:22
|
Branch: refs/heads/master Home: https://github.com/Eyescale/Equalizer Commit: 400dbe87793517bd9428592c417f4194c38dcf3a https://github.com/Eyescale/Equalizer/commit/400dbe87793517bd9428592c417f4194c38dcf3a Author: Daniel Nachbaur <dan...@ep...> Date: 2012-11-06 (Tue, 06 Nov 2012) Changed paths: M CMake/DoxygenRule.cmake M CMake/GNUModules.cmake A CMake/SCM.cmake Log Message: ----------- Merge branch 'master' of https://github.com/Eyescale/Equalizer Commit: 16d8b92d3ca409b2e246673ff4103110ed96a7de https://github.com/Eyescale/Equalizer/commit/16d8b92d3ca409b2e246673ff4103110ed96a7de Author: Daniel Nachbaur <dan...@ep...> Date: 2012-11-06 (Tue, 06 Nov 2012) Log Message: ----------- Merge branch 'master' of https://github.com/Eyescale/Equalizer Commit: 352e5ccd591cdffd4f6280768cb3241755c33fae https://github.com/Eyescale/Equalizer/commit/352e5ccd591cdffd4f6280768cb3241755c33fae Author: Daniel Nachbaur <dan...@ep...> Date: 2012-11-14 (Wed, 14 Nov 2012) Changed paths: M CMake/FindPackages.cmake M doc/CMakeLists.txt M examples/eVolve/channel.cpp M examples/eVolve/channel.h M libs/eq/client/CMakeLists.txt M libs/eq/client/agl/eventHandler.cpp M libs/eq/client/agl/window.cpp M libs/eq/client/files.cmake M libs/eq/fabric/commands.h Log Message: ----------- Merge branch 'master' of https://github.com/Eyescale/Equalizer Commit: d5705b1ccd1e7f4a9d762a405ae3354f401174f4 https://github.com/Eyescale/Equalizer/commit/d5705b1ccd1e7f4a9d762a405ae3354f401174f4 Author: Daniel Nachbaur <dan...@ep...> Date: 2012-11-15 (Thu, 15 Nov 2012) Changed paths: M libs/eq/client/channel.cpp M libs/eq/client/glWindow.cpp M libs/eq/client/pipe.cpp M libs/eq/client/window.cpp M libs/eq/client/window.h Log Message: ----------- Merge branch 'master' of https://github.com/Eyescale/Equalizer Commit: ee617fb0a6cb6edf38ac7f21e8db60a00cf7bdab https://github.com/Eyescale/Equalizer/commit/ee617fb0a6cb6edf38ac7f21e8db60a00cf7bdab Author: Daniel Nachbaur <dan...@ep...> Date: 2012-11-21 (Wed, 21 Nov 2012) Changed paths: M CMake/CPackConfig.cmake M CMake/Common.cmake M CMake/CommonCPack.cmake M CMake/FindLibraryPackage.cmake M CMake/GNUModules.cmake M CMake/GitTargets.cmake M CMake/MacPorts.cmake M CMake/UploadPPA.cmake M CMakeLists.txt M README.rst M RELNOTES.txt M libs/RelNotes.dox M libs/eq/client/channel.cpp M libs/eq/client/compressor/compressorReadDrawPixels.cpp M libs/eq/client/compressor/compressorReadDrawPixels.h M libs/eq/client/wgl/window.cpp M libs/eq/client/wgl/window.h M libs/eq/client/window.cpp M libs/eq/client/window.h M tools/eqPlyConverter/main.cpp Log Message: ----------- Merge branch 'master' of https://github.com/Eyescale/Equalizer Commit: e40873fcbd02a18449a0b4aeb57da6b123f6be2d https://github.com/Eyescale/Equalizer/commit/e40873fcbd02a18449a0b4aeb57da6b123f6be2d Author: Daniel Nachbaur <dan...@ep...> Date: 2012-11-22 (Thu, 22 Nov 2012) Changed paths: M libs/eq/server/node.cpp Log Message: ----------- Merge branch 'master' of https://github.com/Eyescale/Equalizer Commit: 42988e20ebc43123139e759c456d4dea1744b1e6 https://github.com/Eyescale/Equalizer/commit/42988e20ebc43123139e759c456d4dea1744b1e6 Author: Daniel Nachbaur <dan...@ep...> Date: 2012-11-28 (Wed, 28 Nov 2012) Changed paths: M CMake/FindEqualizer.cmake M README.rst M RELNOTES.txt M examples/eqAsync/asyncFetcher.cpp M examples/eqAsync/asyncFetcher.h M examples/eqAsync/eqAsync.cpp M examples/eqPixelBench/main.cpp M examples/eqPly/channel.cpp M examples/eqPly/eqPly.cpp M libs/RelNotes.dox M libs/eq/client/channel.h Log Message: ----------- Merge branch 'master' of https://github.com/Eyescale/Equalizer Commit: 2e12f603bbc54f73370bfcbd4c4c18604ba33a83 https://github.com/Eyescale/Equalizer/commit/2e12f603bbc54f73370bfcbd4c4c18604ba33a83 Author: Daniel Nachbaur <dan...@ep...> Date: 2012-11-28 (Wed, 28 Nov 2012) Changed paths: M libs/eq/server/equalizers/loadEqualizer.cpp M libs/eq/server/equalizers/loadEqualizer.h M libs/eq/server/equalizers/treeEqualizer.cpp M libs/eq/server/equalizers/treeEqualizer.h M libs/eq/server/loader.l M libs/eq/server/loader.y Log Message: ----------- Add loader support & implementation in tree_ and load_equalizer for #186 Commit: 81228a7e29510a39d52666f26f3bff626f218e31 https://github.com/Eyescale/Equalizer/commit/81228a7e29510a39d52666f26f3bff626f218e31 Author: Daniel Nachbaur <dan...@ep...> Date: 2012-11-29 (Thu, 29 Nov 2012) Changed paths: M examples/eqAsync/asyncFetcher.cpp M examples/eqAsync/eqAsync.cpp M libs/eq/client/error.h M libs/eq/fabric/error.cpp M libs/eq/fabric/error.h M libs/eq/util/frameBufferObject.cpp Log Message: ----------- Merge branch 'master' of https://github.com/Eyescale/Equalizer Commit: f6041a39815b57a48e2eabba59ca9280b32a48e7 https://github.com/Eyescale/Equalizer/commit/f6041a39815b57a48e2eabba59ca9280b32a48e7 Author: Daniel Nachbaur <dan...@ep...> Date: 2012-11-29 (Thu, 29 Nov 2012) Changed paths: M libs/eq/client/agl/messagePump.cpp M libs/eq/client/agl/messagePump.h M libs/eq/client/commandQueue.cpp M libs/eq/client/glx/messagePump.cpp M libs/eq/client/glx/messagePump.h M libs/eq/client/messagePump.h M libs/eq/client/wgl/messagePump.cpp M libs/eq/client/wgl/messagePump.h M libs/eq/util/objectManager.h Log Message: ----------- Merge branch 'master' of https://github.com/Eyescale/Equalizer Commit: 0d7ef74154a16adc5a35a6fdbcf574d0abf55bf1 https://github.com/Eyescale/Equalizer/commit/0d7ef74154a16adc5a35a6fdbcf574d0abf55bf1 Author: Daniel Nachbaur <dan...@ep...> Date: 2012-11-29 (Thu, 29 Nov 2012) Changed paths: M libs/eq/server/equalizers/loadEqualizer.cpp M libs/eq/server/equalizers/treeEqualizer.cpp Log Message: ----------- Fix wrong cumulative resistance values Commit: 2a2d460b21af57291e2804fa5829f5b3f4513155 https://github.com/Eyescale/Equalizer/commit/2a2d460b21af57291e2804fa5829f5b3f4513155 Author: Stefan Eilemann <Ste...@ep...> Date: 2012-11-29 (Thu, 29 Nov 2012) Log Message: ----------- Merge branch 'master' of https://github.com/tribal-tec/Equalizer Conflicts: libs/eq/server/equalizers/treeEqualizer.h Compare: https://github.com/Eyescale/Equalizer/compare/2b523b7169fa...2a2d460b21af |
