Branch: refs/heads/master
  Home:   https://github.com/Eyescale/Equalizer
  Commit: 8c23ece394e5e6c0c0c3d3125d1ddd486382c30c
      
https://github.com/Eyescale/Equalizer/commit/8c23ece394e5e6c0c0c3d3125d1ddd486382c30c
  Author: Stefan Eilemann <[email protected]>
  Date:   2012-01-27 (Fri, 27 Jan 2012)

  Changed paths:
    M gpu-sd/apps/gpu_sd/gpu_sd.cpp
  M libs/co/objectPackets.h

  Log Message:
  -----------
  Fix RHEL6 release build

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


  Commit: b0c4b1fae03b6039584df07108941ee4fb83d940
      
https://github.com/Eyescale/Equalizer/commit/b0c4b1fae03b6039584df07108941ee4fb83d940
  Author: Stefan Eilemann <[email protected]>
  Date:   2012-01-27 (Fri, 27 Jan 2012)

  Changed paths:
    M CMake/EqCompilerVersion.cmake
  M CMake/FindCollage.cmake
  M CMake/FindHWLOC.cmake
  M CMake/FindOFED.cmake
  M CMakeLists.txt
  M README.rst
  M RELNOTES.txt
  M examples/configs/4-window.all.eqc
  M examples/eVolve/channel.cpp
  M examples/eqPly/channel.cpp
  M examples/eqPly/channel.h
  M examples/eqPly/eqPly.cpp
  M examples/eqPly/localInitData.cpp
  M examples/eqPly/localInitData.h
  M examples/eqPly/vertexBufferState.cpp
  M gpu-sd/CMake/CPackConfig.cmake
  M gpu-sd/CMakeLists.txt
  M gpu-sd/README.md
  M gpu-sd/apps/gpu_sd/gpu_sd.cpp
  M gpu-sd/libs/gpusd/dns_sd/module.cpp
  M gpu-sd/libs/gpusd/filter.cpp
  M gpu-sd/libs/gpusd/filter.h
  M libs/RelNotes.dox
  M libs/co/base/log.cpp
  M libs/co/commandCache.cpp
  M libs/co/localNode.cpp
  M libs/co/localNode.h
  M libs/co/rdmaConnection.cpp
  M libs/co/rdmaConnection.h
  M libs/eq/client/channel.cpp
  M libs/eq/client/channel.h
  M libs/eq/client/channelPackets.h
  M libs/eq/client/channelStatistics.cpp
  M libs/eq/client/channelStatistics.h
  M libs/eq/client/compositor.cpp
  M libs/eq/client/compositor.h
  M libs/eq/client/config.cpp
  M libs/eq/client/configParams.cpp
  M libs/eq/client/configParams.h
  A libs/eq/client/detail/channel.ipp
  M libs/eq/client/files.cmake
  M libs/eq/client/node.h
  M libs/eq/client/nodeStatistics.cpp
  M libs/eq/client/pipeStatistics.cpp
  M libs/eq/client/server.cpp
  M libs/eq/client/serverPackets.h
  M libs/eq/client/statistic.h
  M libs/eq/client/statisticSampler.h
  M libs/eq/client/window.cpp
  M libs/eq/client/window.h
  M libs/eq/client/windowStatistics.cpp
  M libs/eq/fabric/channel.ipp
  M libs/eq/fabric/node.h
  M libs/eq/fabric/node.ipp
  M libs/eq/fabric/pixelViewport.h
  M libs/eq/fabric/range.h
  M libs/eq/fabric/window.ipp
  M libs/eq/server/channel.cpp
  M libs/eq/server/channel.h
  M libs/eq/server/channelListener.h
  M libs/eq/server/compound.cpp
  M libs/eq/server/config.h
  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
  M libs/eq/server/config/server.h
  M libs/eq/server/equalizers/dfrEqualizer.cpp
  M libs/eq/server/equalizers/dfrEqualizer.h
  M libs/eq/server/equalizers/framerateEqualizer.cpp
  M libs/eq/server/equalizers/framerateEqualizer.h
  M libs/eq/server/equalizers/loadEqualizer.cpp
  M libs/eq/server/equalizers/loadEqualizer.h
  M libs/eq/server/equalizers/treeEqualizer.cpp
  M libs/eq/server/equalizers/treeEqualizer.h
  M libs/eq/server/equalizers/viewEqualizer.cpp
  M libs/eq/server/equalizers/viewEqualizer.h
  M libs/eq/server/global.cpp
  M libs/eq/server/loader.l
  M libs/eq/server/loader.y
  M libs/eq/server/server.cpp
  M libs/eq/server/server.h
  M libs/eq/server/startLocalServer.cpp
  M tests/co/base/rng.cpp
  M tests/co/compressor.cpp
  M tests/eq/fabric/pixelViewport.cpp
  M tools/configTool/frame.h
  M tools/server/eqServer.cpp

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Eyescale/Equalizer

Conflicts:
        gpu-sd/apps/gpu_sd/gpu_sd.cpp


Compare: https://github.com/Eyescale/Equalizer/compare/39498cd...b0c4b1f
------------------------------------------------------------------------------
Try before you buy = See our experts in action!
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-dev2
_______________________________________________
Equalizer-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/equalizer-commit
http://www.equalizergraphics.com

Reply via email to