Branch: refs/heads/1.2
Home: https://github.com/Eyescale/Equalizer
Commit: 34ae3dde1d80c5b550be1df5544d50e2ee57bec6
https://github.com/Eyescale/Equalizer/commit/34ae3dde1d80c5b550be1df5544d50e2ee57bec6
Author: Carsten Rohn <[email protected]>
Date: 2012-02-22 (Wed, 22 Feb 2012)
Changed paths:
M AUTHORS
M CMake/CPackConfig.cmake
M CMake/EqCompilerVersion.cmake
M CMake/FindCollage.cmake
M CMake/FindEqualizer.cmake
M CMake/FindMAGELLAN.cmake
M CMake/GPUSD.cmake
M CMake/UploadPPA.cmake
M CMakeLists.txt
M Makefile
M README.rst
M RELNOTES.txt
M commitMessage.txt
A doc/README.VirtualGL
M examples/CMakeLists.txt
A examples/configs/2-node.tile.eqc
R examples/configs/2-node.tiles.eqc
M examples/configs/4-window.all.eqc
M examples/configs/7-window.DPLEX.2D.lb.eqc
M examples/eVolve/config.cpp
M examples/eVolve/glslShaders.cpp
M examples/eVolve/glslShaders.h
M examples/eqNBody/CMakeLists.txt
M examples/eqNBody/config.cpp
M examples/eqNBody/frameData.cpp
M examples/eqNBody/frameData.h
M examples/eqNBody/sharedDataProxy.cpp
M examples/eqNBody/sharedDataProxy.h
M examples/eqPly/cameraAnimation.cpp
M examples/eqPly/cameraAnimation.h
M examples/eqPly/channel.cpp
M examples/eqPly/config.cpp
M examples/eqPly/config.h
M examples/eqPly/configEvent.h
M examples/eqPly/eqPly.cpp
M examples/eqPly/initData.cpp
M examples/eqPly/node.cpp
M examples/eqPly/pipe.cpp
M examples/eqPly/view.cpp
M examples/eqPly/view.h
M gpu-sd
M libs/RelNotes.dox
M libs/co/commandCache.cpp
M libs/co/connection.cpp
M libs/co/dataIStreamQueue.h
M libs/co/fullMasterCM.cpp
M libs/co/global.cpp
M libs/co/global.h
M libs/co/instanceCache.cpp
M libs/co/localNode.cpp
M libs/co/localNode.h
M libs/co/masterCM.cpp
M libs/co/nodePackets.h
M libs/co/object.h
M libs/co/objectInstanceDataOStream.cpp
M libs/co/objectPackets.h
M libs/co/objectStore.cpp
M libs/co/objectStore.h
M libs/co/packets.h
M libs/co/queueMaster.cpp
M libs/co/queueMaster.h
M libs/co/queuePackets.h
M libs/co/queueSlave.cpp
M libs/co/queueSlave.h
M libs/co/rdmaConnection.cpp
M libs/co/rdmaConnection.h
M libs/co/socketConnection.cpp
M libs/co/staticMasterCM.cpp
M libs/eq/client/agl/window.cpp
M libs/eq/client/channel.cpp
M libs/eq/client/channel.h
M libs/eq/client/channelPackets.h
M libs/eq/client/channelStatistics.cpp
M libs/eq/client/channelStatistics.h
M libs/eq/client/client.cpp
M libs/eq/client/client.h
M libs/eq/client/commandQueue.cpp
M libs/eq/client/compositor.cpp
M libs/eq/client/config.cpp
M libs/eq/client/glx/window.cpp
M libs/eq/client/image.cpp
M libs/eq/client/init.cpp
M libs/eq/client/init.h
M libs/eq/client/node.h
M libs/eq/client/nodeStatistics.cpp
M libs/eq/client/pipe.cpp
M libs/eq/client/pipe.h
M libs/eq/client/pipeStatistics.cpp
M libs/eq/client/serverPackets.h
M libs/eq/client/statisticSampler.h
M libs/eq/client/view.cpp
M libs/eq/client/wgl/window.cpp
M libs/eq/client/window.cpp
M libs/eq/client/window.h
M libs/eq/client/windowPackets.h
M libs/eq/client/windowStatistics.cpp
M libs/eq/fabric/canvas.h
M libs/eq/fabric/commands.h
M libs/eq/fabric/pipe.h
M libs/eq/fabric/pipe.ipp
M libs/eq/fabric/serverPackets.h
M libs/eq/server/CMakeLists.txt
M libs/eq/server/channel.cpp
M libs/eq/server/channelUpdateVisitor.cpp
M libs/eq/server/compound.cpp
M libs/eq/server/compound.h
M libs/eq/server/compoundExitVisitor.h
M libs/eq/server/config.cpp
M libs/eq/server/config.h
M libs/eq/server/configRestoreVisitor.h
M libs/eq/server/equalizers/loadEqualizer.cpp
M libs/eq/server/global.cpp
M libs/eq/server/loader.l
M libs/eq/server/loader.y
M libs/eq/server/pipe.cpp
M libs/eq/server/server.cpp
M libs/eq/server/startLocalServer.cpp
M libs/eq/server/types.h
M libs/eq/server/view.cpp
M libs/seq/detail/application.cpp
M libs/seq/detail/application.h
M libs/seq/detail/objectMap.cpp
M tests/CMakeLists.txt
M tests/co/base/rng.cpp
M tests/co/compressor.cpp
M tests/co/instanceCache.cpp
A tests/eq/client/vector.cpp
Log Message:
-----------
Merge branch '1.2' of https://github.com/Eyescale/Equalizer
Conflicts:
libs/co/commandCache.cpp
libs/co/dataIStreamQueue.h
Commit: b84c5747ec6102c61174e864ab82f820d8322518
https://github.com/Eyescale/Equalizer/commit/b84c5747ec6102c61174e864ab82f820d8322518
Author: Carsten Rohn <[email protected]>
Date: 2012-02-23 (Thu, 23 Feb 2012)
Changed paths:
M libs/co/packets.h
Log Message:
-----------
removed win32 warnings
Commit: 3ad5badc7b5c1dc0b9d7fcfd1ccf7f10f689d97b
https://github.com/Eyescale/Equalizer/commit/3ad5badc7b5c1dc0b9d7fcfd1ccf7f10f689d97b
Author: Stefan Eilemann <[email protected]>
Date: 2012-02-23 (Thu, 23 Feb 2012)
Changed paths:
M README.rst
M RELNOTES.txt
M gpu-sd
M libs/co/packets.h
Log Message:
-----------
Merge cleanup
[ ] May break build
[ ] May break existing applications (see CHANGES.txt)
[x] Bugfix
[ ] New Feature
[ ] Cleanup
[ ] Optimization
[ ] Documentation
Compare: https://github.com/Eyescale/Equalizer/compare/b12479a...3ad5bad
------------------------------------------------------------------------------
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
_______________________________________________
Equalizer-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/equalizer-commit
http://www.equalizergraphics.com
