Branch: refs/heads/master
Home:   https://github.com/Eyescale/Equalizer

Commit: 1381903a8797743956216d598cda2a45f149538e
    
https://github.com/Eyescale/Equalizer/commit/1381903a8797743956216d598cda2a45f149538e
Author: delyas <[email protected]>
Date:   2011-06-07 (Tue, 07 Jun 2011)

Changed paths:
  M libs/collage/localNode.cpp
  M libs/collage/namedPipeConnection.cpp
  M libs/collage/socketConnection.cpp

Log Message:
-----------
* fixed build
* fixed reliable token impl

[ ] May break build
[ ] May break existing applications (see CHANGES.txt)
[x] Bugfix
[ ] New Feature
[ ] Cleanup
[ ] Optimization
[ ] Documentation


Commit: cc3c2e91b5e453bfa8cf848767eedc850f8b5106
    
https://github.com/Eyescale/Equalizer/commit/cc3c2e91b5e453bfa8cf848767eedc850f8b5106
Author: Stefan Eilemann <[email protected]>
Date:   2011-06-07 (Tue, 07 Jun 2011)

Changed paths:
  M libs/collage/localNode.cpp

Log Message:
-----------
Fix merge conflicts

[ ] May break build
[ ] May break existing applications (see CHANGES.txt)
[x] Bugfix
[ ] New Feature
[ ] Cleanup
[ ] Optimization
[ ] Documentation


Compare: https://github.com/Eyescale/Equalizer/compare/2b27ab8...cc3c2e9

------------------------------------------------------------------------------
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
_______________________________________________
Equalizer-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/equalizer-commit
http://www.equalizergraphics.com

Reply via email to