Branch: refs/heads/benchmark
Home: https://github.com/Eyescale/Equalizer
Commit: 921a88f5f3958022cdeba266d673a4eb443177dc
https://github.com/Eyescale/Equalizer/commit/921a88f5f3958022cdeba266d673a4eb443177dc
Author: Stefan Eilemann <[email protected]>
Date: 2012-01-18 (Wed, 18 Jan 2012)
Changed paths:
M libs/eq/server/config/display.cpp
M libs/eq/server/config/resources.cpp
M libs/eq/server/config/resources.h
M libs/eq/server/config/server.cpp
Log Message:
-----------
Manually merge stuff from benchmark
[ ] May break build
[ ] May break existing applications (see CHANGES.txt)
[ ] Bugfix
[ ] New Feature
[x] Cleanup
[ ] Optimization
[ ] Documentation
Commit: f6b20d241fd78c08b43c758a82e9c4bc89e8fc94
https://github.com/Eyescale/Equalizer/commit/f6b20d241fd78c08b43c758a82e9c4bc89e8fc94
Author: Stefan Eilemann <[email protected]>
Date: 2012-01-18 (Wed, 18 Jan 2012)
Changed paths:
M libs/eq/server/config/display.cpp
M libs/eq/server/config/resources.cpp
M libs/eq/server/config/resources.h
Log Message:
-----------
Merge branch 'master' into benchmark
Conflicts:
libs/eq/server/config/display.cpp
libs/eq/server/config/resources.cpp
libs/eq/server/config/resources.h
Compare: https://github.com/Eyescale/Equalizer/compare/6dd1ae8...f6b20d2
------------------------------------------------------------------------------
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
