Branch: refs/heads/endian
Home: https://github.com/Eyescale/Equalizer
Commit: be5e1bad3c3e9f565bf4be06db9e96f9d5ee46b2
https://github.com/Eyescale/Equalizer/commit/be5e1bad3c3e9f565bf4be06db9e96f9d5ee46b2
Author: Stefan Eilemann <eil...@gm...>
Date: 2012-09-04 (Tue, 04 Sep 2012)
Changed paths:
M CMake/Common.cmake
Log Message:
-----------
Merge branch 'master' of https://github.com/Eyescale/CMake
Commit: b88d1256d5d973feda4ec5b58ca5e27928d24ece
https://github.com/Eyescale/Equalizer/commit/b88d1256d5d973feda4ec5b58ca5e27928d24ece
Author: Daniel Nachbaur <dan...@ep...>
Date: 2012-09-04 (Tue, 04 Sep 2012)
Log Message:
-----------
Merge branch 'master' of https://github.com/Eyescale/Equalizer
Commit: 679801fd0b0b75fa2f395b1bab0d49a5e5b85750
https://github.com/Eyescale/Equalizer/commit/679801fd0b0b75fa2f395b1bab0d49a5e5b85750
Author: Daniel Nachbaur <dan...@ep...>
Date: 2012-09-04 (Tue, 04 Sep 2012)
Changed paths:
M libs/eq/admin/server.cpp
M libs/eq/client/channel.cpp
M libs/eq/client/channel.h
M libs/eq/client/compositor.h
M libs/eq/client/config.cpp
M libs/eq/client/node.cpp
M libs/eq/client/pipe.cpp
M libs/eq/client/server.cpp
M libs/eq/client/server.h
M libs/eq/client/window.cpp
M libs/eq/fabric/packetType.h
M libs/eq/server/server.cpp
Log Message:
-----------
Merge branch 'endian' of https://github.com/Eyescale/Equalizer
Commit: c9ff4b55423de853f786cbe93b616f024f2b7d17
https://github.com/Eyescale/Equalizer/commit/c9ff4b55423de853f786cbe93b616f024f2b7d17
Author: Daniel Nachbaur <dan...@ep...>
Date: 2012-09-04 (Tue, 04 Sep 2012)
Changed paths:
M libs/eq/client/config.cpp
M libs/eq/client/node.cpp
M libs/eq/client/pipe.cpp
M libs/eq/client/window.cpp
Log Message:
-----------
Merge cleanups for #145
Commit: a3125c8f78d51ba670a78379b43aec95317187a7
https://github.com/Eyescale/Equalizer/commit/a3125c8f78d51ba670a78379b43aec95317187a7
Author: Daniel Nachbaur <dan...@ep...>
Date: 2012-09-04 (Tue, 04 Sep 2012)
Changed paths:
M libs/eq/client/channel.cpp
Log Message:
-----------
Merge cleanups for #145
Commit: e1f798cb570bb482bf0d29013a73e475f60e6a38
https://github.com/Eyescale/Equalizer/commit/e1f798cb570bb482bf0d29013a73e475f60e6a38
Author: Daniel Nachbaur <dan...@gm...>
Date: 2012-09-04 (Tue, 04 Sep 2012)
Changed paths:
M examples/eqPixelBench/channel.cpp
M examples/eqPixelBench/channel.h
M examples/eqPixelBench/config.cpp
M examples/eqPixelBench/configEvent.cpp
M examples/eqPixelBench/configEvent.h
M examples/eqPly/channel.cpp
M examples/eqPly/config.cpp
M examples/eqPly/config.h
M examples/eqPly/configEvent.cpp
M examples/eqPly/configEvent.h
M examples/eqPly/eqPly.cpp
M examples/eqPly/frameData.cpp
M examples/eqPly/frameData.h
M libs/eq/admin/server.cpp
M libs/eq/client/channel.cpp
M libs/eq/client/channel.h
M libs/eq/client/channelStatistics.cpp
M libs/eq/client/client.cpp
M libs/eq/client/client.h
M libs/eq/client/commandQueue.cpp
M libs/eq/client/commandQueue.h
M libs/eq/client/compositor.cpp
M libs/eq/client/compressor/compressorReadDrawPixels.cpp
M libs/eq/client/compressor/compressorYUV.cpp
M libs/eq/client/config.cpp
M libs/eq/client/config.h
M libs/eq/client/frame.cpp
M libs/eq/client/frame.h
M libs/eq/client/frameData.cpp
M libs/eq/client/frameData.h
M libs/eq/client/glWindow.cpp
M libs/eq/client/glx/pipe.cpp
M libs/eq/client/image.cpp
M libs/eq/client/image.h
M libs/eq/client/node.cpp
M libs/eq/client/pipe.cpp
M libs/eq/client/pipe.h
M libs/eq/client/pipeStatistics.cpp
M libs/eq/client/pixelData.cpp
M libs/eq/client/pixelData.h
M libs/eq/client/server.cpp
M libs/eq/client/types.h
M libs/eq/client/view.cpp
M libs/eq/client/view.h
M libs/eq/client/wgl/pipe.cpp
M libs/eq/client/wgl/pipe.h
M libs/eq/client/window.cpp
M libs/eq/client/window.h
M libs/eq/client/windowStatistics.cpp
M libs/eq/fabric/canvas.ipp
M libs/eq/fabric/channel.ipp
M libs/eq/fabric/client.cpp
M libs/eq/fabric/client.h
M libs/eq/fabric/commands.h
M libs/eq/fabric/config.h
M libs/eq/fabric/config.ipp
M libs/eq/fabric/layout.ipp
M libs/eq/fabric/object.cpp
M libs/eq/fabric/object.h
M libs/eq/fabric/observer.ipp
M libs/eq/fabric/packetType.h
M libs/eq/fabric/pipe.ipp
M libs/eq/fabric/segment.ipp
M libs/eq/fabric/server.ipp
M libs/eq/fabric/types.h
M libs/eq/fabric/view.h
M libs/eq/fabric/view.ipp
M libs/eq/fabric/wall.cpp
M libs/eq/fabric/wall.h
M libs/eq/fabric/window.ipp
M libs/eq/server/changeLatencyVisitor.h
M libs/eq/server/channel.cpp
M libs/eq/server/channelStopFrameVisitor.h
M libs/eq/server/channelUpdateVisitor.cpp
M libs/eq/server/compound.cpp
M libs/eq/server/compound.h
M libs/eq/server/compoundInitVisitor.cpp
M libs/eq/server/compoundUpdateInputVisitor.cpp
M libs/eq/server/compoundUpdateInputVisitor.h
M libs/eq/server/compoundUpdateOutputVisitor.cpp
M libs/eq/server/compoundUpdateOutputVisitor.h
M libs/eq/server/config.cpp
M libs/eq/server/config.h
M libs/eq/server/config/display.cpp
M libs/eq/server/config/display.h
M libs/eq/server/config/resources.cpp
M libs/eq/server/config/resources.h
M libs/eq/server/config/server.cpp
M libs/eq/server/equalizers/equalizer.cpp
M libs/eq/server/equalizers/tileEqualizer.cpp
M libs/eq/server/frameData.cpp
M libs/eq/server/frameData.h
M libs/eq/server/global.cpp
M libs/eq/server/loader.y
M libs/eq/server/node.cpp
M libs/eq/server/server.cpp
M libs/eq/server/server.h
M libs/eq/server/startLocalServer.cpp
M libs/eq/server/tileQueue.cpp
M libs/eq/server/tileQueue.h
M libs/eq/server/types.h
M libs/eq/server/view.cpp
M libs/eq/server/view.h
M tools/server/eqServer.cpp
Log Message:
-----------
Update copyrights
Commit: 71d2047b3feb91da02aa7cdb7fffb595fc405be0
https://github.com/Eyescale/Equalizer/commit/71d2047b3feb91da02aa7cdb7fffb595fc405be0
Author: Stefan Eilemann <eil...@gm...>
Date: 2012-09-05 (Wed, 05 Sep 2012)
Changed paths:
M libs/eq/client/channel.cpp
M libs/eq/client/detail/channel.ipp
Log Message:
-----------
Fix https://github.com/Eyescale/Lunchbox/commit/70715b392515d9fed184b44e035e34edb0bd6100#commitcomment-1796718
Commit: c453cd0f322305d82d9a1cb2c602a99f478e4413
https://github.com/Eyescale/Equalizer/commit/c453cd0f322305d82d9a1cb2c602a99f478e4413
Author: Stefan Eilemann <eil...@gm...>
Date: 2012-09-05 (Wed, 05 Sep 2012)
Changed paths:
M CMake/Common.cmake
Log Message:
-----------
Merge branch 'master' of https://github.com/Eyescale/Equalizer
Commit: 93cf968b0bb5944630442c3640f1f70d5b02aa0f
https://github.com/Eyescale/Equalizer/commit/93cf968b0bb5944630442c3640f1f70d5b02aa0f
Author: Daniel Nachbaur <dan...@ep...>
Date: 2012-09-05 (Wed, 05 Sep 2012)
Changed paths:
M libs/eq/client/channel.cpp
M libs/eq/client/detail/channel.ipp
Log Message:
-----------
Merge branch 'master' of https://github.com/Eyescale/Equalizer
Conflicts:
libs/eq/client/channel.cpp
Commit: d43b305cb58ee5fa60c30c01a28df5e8d4a7265b
https://github.com/Eyescale/Equalizer/commit/d43b305cb58ee5fa60c30c01a28df5e8d4a7265b
Author: Stefan Eilemann <eil...@gm...>
Date: 2012-09-05 (Wed, 05 Sep 2012)
Changed paths:
M libs/eq/client/channel.cpp
M libs/eq/client/channel.h
M libs/eq/client/config.cpp
M libs/eq/client/config.h
M libs/eq/client/detail/channel.ipp
M libs/eq/client/node.cpp
R libs/eq/client/packets.h
M libs/eq/client/pipe.cpp
M libs/eq/client/pipe.h
M libs/eq/client/server.cpp
M libs/eq/client/statistic.h
M libs/eq/client/types.h
M libs/eq/client/window.cpp
M libs/eq/fabric/colorMask.h
M libs/eq/fabric/files.cmake
M libs/eq/fabric/renderContext.cpp
M libs/eq/fabric/renderContext.h
M libs/eq/fabric/server.ipp
A libs/eq/fabric/tile.h
M libs/eq/fabric/types.h
M libs/eq/server/channel.cpp
M libs/eq/server/channel.h
M libs/eq/server/channelUpdateVisitor.cpp
M libs/eq/server/compoundUpdateOutputVisitor.cpp
M libs/eq/server/config.cpp
M libs/eq/server/configUpdateSyncVisitor.h
M libs/eq/server/node.h
M libs/eq/server/server.cpp
M libs/eq/server/tileQueue.cpp
M libs/eq/server/tileQueue.h
Log Message:
-----------
Merge cleanups for Eyescale/Equalizer#145
Compare: https://github.com/Eyescale/Equalizer/compare/b60cc04d9f43...d43b305cb58e
|
