Branch: refs/heads/async
Home: https://github.com/Eyescale/Equalizer
Commit: d5b667178711bd11447ec4360aa948db8517400b
https://github.com/Eyescale/Equalizer/commit/d5b667178711bd11447ec4360aa948db8517400b
Author: Stefan Eilemann <[email protected]>
Date: 2012-02-17 (Fri, 17 Feb 2012)
Changed paths:
M examples/eqPly/initData.cpp
Log Message:
-----------
Merge branch '1.2'
Conflicts:
examples/eqPly/initData.cpp
Commit: 7e1cf1a3890d6d1f8ec9cf9476e29f956dec9545
https://github.com/Eyescale/Equalizer/commit/7e1cf1a3890d6d1f8ec9cf9476e29f956dec9545
Author: Stefan Eilemann <[email protected]>
Date: 2012-02-17 (Fri, 17 Feb 2012)
Changed paths:
M .gitignore
M CMakeLists.txt
M Makefile
M commitMessage.txt
M examples/eqPixelBench/channel.cpp
M examples/eqPly/channel.cpp
M examples/eqPly/config.cpp
M examples/eqPly/config.h
M examples/eqPly/eqPly.cpp
M examples/eqPly/initData.cpp
M libs/co/api.h
M libs/co/barrier.cpp
M libs/co/barrier.h
M libs/co/base/base.h
M libs/co/base/compressor.h
M libs/co/base/cpuCompressor.h
M libs/co/base/debug.cpp
M libs/co/base/debug.h
M libs/co/base/files.cmake
M libs/co/base/launcher.h
M libs/co/base/lock.cpp
M libs/co/base/lock.h
M libs/co/base/log.cpp
M libs/co/base/log.h
M libs/co/base/omp.cpp
M libs/co/base/perThread.h
M libs/co/base/perThreadRef.h
M libs/co/base/precompile.h
M libs/co/base/refPtr.h
M libs/co/base/referenced.h
M libs/co/base/requestHandler.cpp
M libs/co/base/requestHandler.h
M libs/co/base/ring.h
M libs/co/base/rng.cpp
M libs/co/base/rng.h
A libs/co/base/spinLock.cpp
M libs/co/base/spinLock.h
M libs/co/base/thread.cpp
M libs/co/base/thread.h
M libs/co/base/threadID.cpp
M libs/co/base/threadID.h
M libs/co/base/timedLock.cpp
M libs/co/base/timedLock.h
M libs/co/base/types.h
M libs/co/connection.h
M libs/co/connectionSet.cpp
M libs/co/dispatcher.h
M libs/co/packets.h
M libs/co/pipeConnection.cpp
M libs/co/types.h
M libs/eq/client/agl/window.cpp
M libs/eq/client/client.cpp
M libs/eq/client/client.h
M libs/eq/client/config.cpp
M libs/eq/client/gl.h
M libs/eq/client/glx/window.cpp
M libs/eq/client/node.h
M libs/eq/client/pipe.h
M libs/eq/client/wgl/eventHandler.h
M libs/eq/client/wgl/window.cpp
M libs/eq/fabric/server.h
M libs/eq/fabric/view.h
M libs/eq/fabric/view.ipp
M libs/eq/fabric/wall.cpp
M libs/eq/fabric/wall.h
M libs/eq/server/channel.h
M libs/eq/server/config.h
M libs/eq/server/view.cpp
M libs/eq/server/window.h
M tests/co/barrier.cpp
M tests/eq/client/configVisitor.cpp
M tests/test.h
M tools/netperf/netperf.cpp
Log Message:
-----------
Merge branch 'master' into async
Conflicts:
examples/eqPixelBench/channel.cpp
Compare: https://github.com/Eyescale/Equalizer/compare/47ee90b...7e1cf1a
------------------------------------------------------------------------------
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
