[eq-commit] [Eyescale/Equalizer] 30f9dd: Merge branch 'master' of https://github.com/Eyesca...
Brought to you by:
eile
From: GitHub <no...@gi...> - 2013-01-18 10:29:49
|
Branch: refs/heads/master Home: https://github.com/Eyescale/Equalizer Commit: 30f9ddac3fa640dd2e651cecca116d3106cfe148 https://github.com/Eyescale/Equalizer/commit/30f9ddac3fa640dd2e651cecca116d3106cfe148 Author: Daniel Nachbaur <dan...@ep...> Date: 2013-01-15 (Tue, 15 Jan 2013) Changed paths: M eq/server/config/resources.cpp M eq/server/config/server.cpp M eq/server/server.cpp Log Message: ----------- Merge branch 'master' of https://github.com/Eyescale/Equalizer Commit: f7830f2caffd58b9cfc812a9c2e901ae7591467d https://github.com/Eyescale/Equalizer/commit/f7830f2caffd58b9cfc812a9c2e901ae7591467d Author: Daniel Nachbaur <dan...@ep...> Date: 2013-01-16 (Wed, 16 Jan 2013) Changed paths: M CMake/PackageConfig.cmake M GNUmakefile M eq/client/channel.cpp M eq/client/config.cpp M eq/client/event.cpp M eq/client/nodeStatistics.cpp M eq/client/pipe.cpp M eq/client/server.cpp M eq/client/statisticSampler.h M eq/client/wgl/eventHandler.cpp M eq/client/window.cpp M eq/client/window.h M eq/fabric/canvas.ipp M eq/fabric/channel.h M eq/fabric/channel.ipp M eq/fabric/config.ipp M eq/fabric/object.cpp M eq/fabric/segment.ipp M eq/fabric/view.ipp M eq/server/channelUpdateVisitor.cpp M eq/server/config.cpp M eq/server/config/resources.cpp M eq/server/server.cpp M eq/server/tileQueue.cpp M examples/CMakeLists.txt M examples/eVolve/config.cpp M examples/eVolve/frameData.cpp M examples/eVolve/initData.cpp M examples/eqNBody/config.cpp M examples/eqNBody/initData.cpp M examples/eqPly/channel.cpp M examples/eqPly/config.cpp M examples/eqPly/frameData.cpp M examples/eqPly/initData.cpp M examples/eqPly/vertexBufferDist.cpp M examples/eqPly/view.cpp M examples/osgScaleViewer/config.cpp M examples/osgScaleViewer/initData.cpp M examples/osgScaleViewer/initData.h M examples/seqPly/application.cpp M seq/detail/channel.h M seq/detail/masterConfig.cpp M seq/detail/objectMap.cpp M seq/detail/window.h M seq/types.h Log Message: ----------- Merge branch 'master' of https://github.com/Eyescale/Equalizer Commit: 2cdcdd6fd22bbe1ac14e40f2a98936e2b0b2de0e https://github.com/Eyescale/Equalizer/commit/2cdcdd6fd22bbe1ac14e40f2a98936e2b0b2de0e Author: Daniel Nachbaur <dan...@ep...> Date: 2013-01-17 (Thu, 17 Jan 2013) Changed paths: M CMake/FindPackages.cmake M eq/client/CMakeLists.txt M eq/client/global.h M eq/fabric/canvas.ipp M eq/fabric/frustum.cpp M eq/fabric/frustum.h M eq/fabric/segment.h M eq/fabric/segment.ipp M eq/fabric/view.h M eq/fabric/view.ipp M eq/server/compound.cpp M eq/server/frustum.cpp M eq/server/frustum.h M eq/server/view.cpp M examples/osgScaleViewer/CMakeLists.txt M examples/osgScaleViewer/channel.h M examples/osgScaleViewer/config.h M examples/osgScaleViewer/frameData.h M examples/osgScaleViewer/initData.h M examples/osgScaleViewer/main.cpp M examples/osgScaleViewer/node.h M examples/osgScaleViewer/nodeFactory.h M examples/osgScaleViewer/osgScaleViewer.h M examples/osgScaleViewer/pipe.h M examples/osgScaleViewer/sceneReader.h M examples/osgScaleViewer/tracker.h M examples/osgScaleViewer/window.h Log Message: ----------- Merge branch 'master' of https://github.com/Eyescale/Equalizer Commit: b0398a9af957676ba17fd0a0c39946ab918f34cf https://github.com/Eyescale/Equalizer/commit/b0398a9af957676ba17fd0a0c39946ab918f34cf Author: Daniel Nachbaur <dan...@ep...> Date: 2013-01-18 (Fri, 18 Jan 2013) Changed paths: M eq/client/pipe.cpp Log Message: ----------- Fix SIGFPE Compare: https://github.com/Eyescale/Equalizer/compare/daa5c910fd93...b0398a9af957 |