Branch: refs/heads/master
Home: https://github.com/Eyescale/Equalizer
Commit: 761e09e51c999911d5970dc5913610384ac22df0
https://github.com/Eyescale/Equalizer/commit/761e09e51c999911d5970dc5913610384ac22df0
Author: Stefan Eilemann <[email protected]>
Date: 2011-08-09 (Tue, 09 Aug 2011)
Changed paths:
M Makefile
Log Message:
-----------
Minor Makefile tweak for CI integration
[ ] May break build
[ ] May break existing applications (see CHANGES.txt)
[ ] Bugfix
[ ] New Feature
[x] Cleanup
[ ] Optimization
[ ] Documentation
Commit: 76a2186d1fd9a658c59ae41e140fcc61969bde7b
https://github.com/Eyescale/Equalizer/commit/76a2186d1fd9a658c59ae41e140fcc61969bde7b
Author: Stefan Eilemann <[email protected]>
Date: 2011-08-09 (Tue, 09 Aug 2011)
Changed paths:
M .gitignore
M CMake/EqCompilerVersion.cmake
M CMake/FindGLEW_MX.cmake
R CMake/FindGit.cmake
M CMake/copyScript.cmake
M CMake/revision.cmake
M Makefile
M examples/eqAsync/asyncFetcher.cpp
M examples/eqPly/vertexBufferState.h
M examples/seqPly/renderer.cpp
M examples/seqPly/renderer.h
M libs/co/base/CMakeLists.txt
M libs/co/namedPipeConnection.cpp
M libs/eq/admin/channel.h
M libs/eq/admin/node.h
M libs/eq/client/CMakeLists.txt
M libs/eq/client/cudaContext.cpp
M libs/eq/client/files.cmake
M libs/eq/client/pipe.h
M libs/eq/client/system.h
M libs/eq/client/types.h
A libs/eq/client/wgl/eventHandler.cpp
A libs/eq/client/wgl/eventHandler.h
A libs/eq/client/wgl/messagePump.cpp
A libs/eq/client/wgl/messagePump.h
A libs/eq/client/wgl/pipe.cpp
A libs/eq/client/wgl/pipe.h
A libs/eq/client/wgl/types.h
R libs/eq/client/wgl/wglFactory.cpp
A libs/eq/client/wgl/window.cpp
A libs/eq/client/wgl/window.h
A libs/eq/client/wgl/windowEvent.h
A libs/eq/client/wgl/windowSystem.cpp
R libs/eq/client/wglEventHandler.cpp
R libs/eq/client/wglEventHandler.h
R libs/eq/client/wglMessagePump.cpp
R libs/eq/client/wglMessagePump.h
R libs/eq/client/wglPipe.cpp
R libs/eq/client/wglPipe.h
A libs/eq/client/wglTypes.h
R libs/eq/client/wglWindow.cpp
R libs/eq/client/wglWindow.h
R libs/eq/client/wglWindowEvent.h
M libs/eq/fabric/node.ipp
M libs/eq/fabric/object.cpp
M libs/eq/fabric/object.h
M libs/eq/server/config.cpp
M libs/eq/server/equalizers/treeEqualizer.cpp
M libs/eq/server/view.cpp
M libs/seq/detail/channel.cpp
M libs/seq/detail/channel.h
M libs/seq/detail/renderer.cpp
M libs/seq/detail/renderer.h
M libs/seq/detail/window.cpp
M libs/seq/detail/window.h
M libs/seq/renderer.cpp
M libs/seq/renderer.h
M tests/CMakeLists.txt
Log Message:
-----------
Fix merge conflict
[ ] May break build
[ ] May break existing applications (see CHANGES.txt)
[x] Bugfix
[ ] New Feature
[ ] Cleanup
[ ] Optimization
[ ] Documentation
Compare: https://github.com/Eyescale/Equalizer/compare/a96bb5a...76a2186
------------------------------------------------------------------------------
uberSVN's rich system and user administration capabilities and model
configuration take the hassle out of deploying and managing Subversion and
the tools developers use with it. Learn more about uberSVN and get a free
download at: http://p.sf.net/sfu/wandisco-dev2dev
_______________________________________________
Equalizer-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/equalizer-commit
http://www.equalizergraphics.com
