Branch: refs/heads/master
Home: https://github.com/Eyescale/Equalizer
Commit: 0b8bbb214910a189044284de8a2446451235595c
https://github.com/Eyescale/Equalizer/commit/0b8bbb214910a189044284de8a2446451235595c
Author: Stefan Eilemann <[email protected]>
Date: 2011-06-03 (Fri, 03 Jun 2011)
Changed paths:
M commitMessage.txt
M examples/eVolve/channel.cpp
M examples/eqPly/channel.cpp
M libs/client/node.cpp
M libs/client/pipe.cpp
M libs/collage/base/defines.h
M libs/collage/connection.cpp
M libs/collage/connection.h
M libs/collage/connectionSet.cpp
M libs/collage/fdConnection.cpp
M libs/collage/global.cpp
M libs/collage/global.h
M libs/collage/namedPipeConnection.cpp
M libs/collage/socketConnection.cpp
Log Message:
-----------
resolve merge conflicts
[ ] May break build
[ ] May break existing applications (see CHANGES.txt)
[x] Bugfix
[ ] New Feature
[ ] Cleanup
[ ] Optimization
[ ] Documentation
Commit: c815d615bda24c3f65c50173efc7548df0e2e33b
https://github.com/Eyescale/Equalizer/commit/c815d615bda24c3f65c50173efc7548df0e2e33b
Author: Stefan Eilemann <[email protected]>
Date: 2011-06-03 (Fri, 03 Jun 2011)
Changed paths:
M examples/eVolve/channel.cpp
M examples/eVolve/localInitData.cpp
M examples/eqPly/channel.cpp
M examples/eqPly/localInitData.cpp
M examples/eqPly/vertexBufferRoot.cpp
M examples/eqPly/vertexData.cpp
M libs/client/channel.cpp
M libs/client/config.cpp
M libs/client/node.cpp
M libs/client/window.cpp
M libs/collage/barrier.h
M libs/collage/base/condition.cpp
M libs/collage/base/condition.h
M libs/collage/base/defines.h
M libs/collage/base/mtQueue.h
M libs/collage/base/timedLock.cpp
M libs/collage/base/timedLock.h
M libs/collage/base/types.h
M libs/collage/commandCache.cpp
M libs/collage/commandQueue.cpp
M libs/collage/connection.cpp
M libs/collage/connectionSet.cpp
M libs/collage/connectionSet.h
M libs/collage/fdConnection.cpp
M libs/collage/fdConnection.h
M libs/collage/global.cpp
M libs/collage/global.h
M libs/collage/rspConnection.cpp
M libs/collage/socketConnection.cpp
M libs/fabric/config.h
Log Message:
-----------
Cleanups on last merge:
- Deactive non-working posix socket timeout handling
- Consistent catch and printing of exceptions
- Consistent 'infinite' timeout handling
[ ] May break build
[ ] May break existing applications (see CHANGES.txt)
[x] Bugfix
[ ] New Feature
[ ] Cleanup
[ ] Optimization
[ ] Documentation
Compare: https://github.com/Eyescale/Equalizer/compare/c89a27e...c815d61
------------------------------------------------------------------------------
Simplify data backup and recovery for your virtual environment with vRanger.
Installation's a snap, and flexible recovery options mean your data is safe,
secure and there when you need it. Discover what all the cheering's about.
Get your free trial download today.
http://p.sf.net/sfu/quest-dev2dev2
_______________________________________________
Equalizer-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/equalizer-commit
http://www.equalizergraphics.com
