Branch: refs/heads/master
Home: https://github.com/Eyescale/Equalizer
Commit: 9dd761d0d69975d3743963d9a328daa95da17304
https://github.com/Eyescale/Equalizer/commit/9dd761d0d69975d3743963d9a328daa95da17304
Author: delyas <[email protected]>
Date: 2011-06-16 (Thu, 16 Jun 2011)
Changed paths:
M libs/collage/packets.h
M libs/collage/queueMaster.cpp
M libs/collage/queueMaster.h
M libs/collage/queueSlave.cpp
M libs/collage/queueSlave.h
A tests/collage/queue.cpp
Log Message:
-----------
tile queues unit test
bugfixes and cleanups
[ ] May break build
[ ] May break existing applications (see CHANGES.txt)
[x] Bugfix
[x] New Feature
[x] Cleanup
[ ] Optimization
[ ] Documentation
Commit: 7b217611e6401107f3fe4edfe220525fe5eed013
https://github.com/Eyescale/Equalizer/commit/7b217611e6401107f3fe4edfe220525fe5eed013
Author: Daniel Nachbaur <[email protected]>
Date: 2011-06-16 (Thu, 16 Jun 2011)
Changed paths:
M examples/configs/2-node.2D.eqc
M libs/collage/packets.h
M libs/collage/queueMaster.cpp
M libs/collage/queueMaster.h
M libs/collage/queueSlave.cpp
M libs/collage/queueSlave.h
A tests/collage/queue.cpp
Log Message:
-----------
Merge branch 'tile' of https://github.com/tribal-tec/Equalizer into tile
Conflicts:
libs/collage/queueMaster.cpp
Commit: 21b8dcd8089db496745a04c263f2bce1ffd3e33e
https://github.com/Eyescale/Equalizer/commit/21b8dcd8089db496745a04c263f2bce1ffd3e33e
Author: Daniel Nachbaur <[email protected]>
Date: 2011-06-16 (Thu, 16 Jun 2011)
Changed paths:
M examples/eqPly/channel.cpp
M examples/eqPly/typedefs.h
M examples/eqPly/vertexBufferState.h
M examples/eqPly/window.cpp
M examples/eqPly/window.h
M libs/client/pipe.cpp
M libs/client/types.h
M tests/base/lock.cpp
M tests/collage/pipeperf.cpp
Log Message:
-----------
Merge branch 'master' of https://github.com/Eyescale/Equalizer into tile
Conflicts:
libs/client/pipe.cpp
Commit: cd4f574fc472425555f4bdd4e6955bbdf4def6ad
https://github.com/Eyescale/Equalizer/commit/cd4f574fc472425555f4bdd4e6955bbdf4def6ad
Author: Daniel Nachbaur <[email protected]>
Date: 2011-06-16 (Thu, 16 Jun 2011)
Changed paths:
M libs/collage/queueMaster.cpp
M libs/collage/queueMaster.h
M libs/server/compound.cpp
Log Message:
-----------
fixed build after merge; cleanup
[ ] May break build
[ ] Breaks existing applications
[x] Bugfix
[ ] New Feature
[x] Cleanup
[ ] Optimization
[ ] Documentation
Commit: 440ef2a830c99b2439d20c7a195038917fa0f4b7
https://github.com/Eyescale/Equalizer/commit/440ef2a830c99b2439d20c7a195038917fa0f4b7
Author: Stefan Eilemann <[email protected]>
Date: 2011-06-17 (Fri, 17 Jun 2011)
Changed paths:
M examples/configs/2-node.2D.eqc
M examples/configs/2-node.tiles.eqc
M libs/client/channel.cpp
M libs/client/channel.h
M libs/client/channelPackets.h
M libs/client/pipe.cpp
M libs/client/pipe.h
M libs/collage/queueMaster.cpp
M libs/collage/queueSlave.cpp
M libs/collage/queueSlave.h
M libs/server/compound.cpp
M libs/server/compoundUpdateInputVisitor.cpp
M libs/server/compoundUpdateOutputVisitor.cpp
M libs/server/compoundUpdateOutputVisitor.h
Log Message:
-----------
Code cleanups and fixes on last merge
[ ] May break build
[ ] May break existing applications (see CHANGES.txt)
[x] Bugfix
[ ] New Feature
[x] Cleanup
[ ] Optimization
[ ] Documentation
Compare: https://github.com/Eyescale/Equalizer/compare/bb4c90f...440ef2a
------------------------------------------------------------------------------
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
