Branch: refs/heads/master
Home: https://github.com/Eyescale/Equalizer
Commit: cafa81b672b596eacc7ad96bde582a31f8c7687b
https://github.com/Eyescale/Equalizer/commit/cafa81b672b596eacc7ad96bde582a31f8c7687b
Author: Stefan Eilemann <[email protected]>
Date: 2012-03-13 (Tue, 13 Mar 2012)
Changed paths:
M libs/co/localNode.cpp
M libs/co/localNode.h
M libs/co/node.cpp
M libs/co/nodePackets.h
M libs/co/objectStore.cpp
M libs/co/rspConnection.cpp
M libs/eq/client/client.cpp
M tests/CMakeLists.txt
M tools/netperf/netperf.cpp
Log Message:
-----------
Merge branch '1.2'
Conflicts:
libs/co/localNode.cpp
libs/co/localNode.h
Commit: bcd5e98e8c0183bde995c8942b9f27337bdcaf5c
https://github.com/Eyescale/Equalizer/commit/bcd5e98e8c0183bde995c8942b9f27337bdcaf5c
Author: Stefan Eilemann <[email protected]>
Date: 2012-03-13 (Tue, 13 Mar 2012)
Changed paths:
M libs/co/localNode.cpp
Log Message:
-----------
Fix build after merge
[ ] May break build
[ ] May break existing applications (see CHANGES.txt)
[x] Bugfix
[ ] New Feature
[ ] Cleanup
[ ] Optimization
[ ] Documentation
Commit: 5ec6cae4f5b916f81c3109bf48343c2545ecf966
https://github.com/Eyescale/Equalizer/commit/5ec6cae4f5b916f81c3109bf48343c2545ecf966
Author: Stefan Eilemann <[email protected]>
Date: 2012-03-13 (Tue, 13 Mar 2012)
Changed paths:
M libs/co/base/init.cpp
M libs/co/objectStore.cpp
Log Message:
-----------
Merge branch 'master' of https://github.com/Eyescale/Equalizer
Compare: https://github.com/Eyescale/Equalizer/compare/ac0daae...5ec6cae
------------------------------------------------------------------------------
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
