Branch: refs/heads/async
Home: https://github.com/Eyescale/Equalizer
Commit: d09027c64d1c5f28f423c85f85646c7abfb1c799
https://github.com/Eyescale/Equalizer/commit/d09027c64d1c5f28f423c85f85646c7abfb1c799
Author: Stefan Eilemann <[email protected]>
Date: 2012-02-01 (Wed, 01 Feb 2012)
Changed paths:
M examples/eqAsync/asyncFetcher.h
M libs/co/base/plugin.cpp
M libs/co/base/plugin.h
M libs/co/compressor/compressor.cpp
M libs/co/compressor/compressor.h
M libs/co/plugins/compressor.h
A libs/eq/client/asyncRB/aglWindowShared.cpp
A libs/eq/client/asyncRB/aglWindowShared.h
A libs/eq/client/asyncRB/asyncRBThread.cpp
A libs/eq/client/asyncRB/asyncRBThread.h
A libs/eq/client/asyncRB/glXWindowShared.h
M libs/eq/client/channel.cpp
M libs/eq/client/channel.h
M libs/eq/client/channelPackets.h
M libs/eq/client/compressor/compressor.cpp
M libs/eq/client/compressor/compressor.h
M libs/eq/client/compressor/compressorReadDrawPixels.cpp
M libs/eq/client/compressor/compressorReadDrawPixels.h
M libs/eq/client/error.h
M libs/eq/client/files.cmake
M libs/eq/client/frame.cpp
M libs/eq/client/frame.h
M libs/eq/client/frameData.cpp
M libs/eq/client/frameData.h
M libs/eq/client/image.cpp
M libs/eq/client/image.h
M libs/eq/client/pipe.cpp
M libs/eq/client/pipe.h
M libs/eq/client/pipePackets.h
M libs/eq/fabric/commands.h
M libs/eq/fabric/error.cpp
M libs/eq/fabric/error.h
M libs/eq/fabric/packets.h
M libs/eq/util/files.cmake
M libs/eq/util/gpuCompressor.cpp
M libs/eq/util/gpuCompressor.h
M libs/eq/util/objectManager.h
M libs/eq/util/objectManager.ipp
A libs/eq/util/pixelBufferObject.cpp
A libs/eq/util/pixelBufferObject.h
M libs/eq/util/types.h
Log Message:
-----------
Merge branch 'master' of https://github.com/maxmah/Equalizer into async
Conflicts:
libs/eq/client/channel.cpp
libs/eq/client/frameData.cpp
Commit: abc33fc72ff40fa06071c645687f7ca9d285e457
https://github.com/Eyescale/Equalizer/commit/abc33fc72ff40fa06071c645687f7ca9d285e457
Author: Stefan Eilemann <[email protected]>
Date: 2012-02-01 (Wed, 01 Feb 2012)
Changed paths:
M libs/eq/client/files.cmake
Log Message:
-----------
Fix build
[ ] May break build
[ ] May break existing applications (see CHANGES.txt)
[x] Bugfix
[ ] New Feature
[ ] Cleanup
[ ] Optimization
[ ] Documentation
Compare: https://github.com/Eyescale/Equalizer/compare/6437394...abc33fc
------------------------------------------------------------------------------
Keep Your Developer Skills Current with LearnDevNow!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-d2d
_______________________________________________
Equalizer-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/equalizer-commit
http://www.equalizergraphics.com
