Branch: refs/heads/master
  Home:   https://github.com/Eyescale/Equalizer
  Commit: 55797466d93fb38624fe5824f06ea3302526a303
      
https://github.com/Eyescale/Equalizer/commit/55797466d93fb38624fe5824f06ea3302526a303
  Author: marwan-abdellah <[email protected]>
  Date:   2012-01-18 (Wed, 18 Jan 2012)

  Changed paths:
    R .gitmodules
  M CMake/FindCollage.cmake
  M CMake/FindOFED.cmake
  M CMake/GPUSD.cmake
  M examples/configs/7-window.DPLEX.2D.lb.eqc
  M examples/eqPly/channel.cpp
  M examples/eqPly/config.h
  M examples/eqPly/configEvent.h
  M examples/eqPly/view.cpp
  M examples/eqPly/view.h
  R gpu-sd
  A gpu-sd/.gitignore
  A gpu-sd/CMake/CPackConfig.cmake
  A gpu-sd/CMake/FindDNSSD.cmake
  A gpu-sd/CMake/FindGPUSD.cmake
  A gpu-sd/CMake/UploadPPA.cmake
  A gpu-sd/CMakeLists.txt
  A gpu-sd/LICENSE.txt
  A gpu-sd/Makefile
  A gpu-sd/README.md
  A gpu-sd/apps/CMakeLists.txt
  A gpu-sd/apps/gpu_sd/CMakeLists.txt
  A gpu-sd/apps/gpu_sd/gpu_sd.cpp
  A gpu-sd/apps/gpu_sd_list/CMakeLists.txt
  A gpu-sd/apps/gpu_sd_list/gpu_sd_list.cpp
  A gpu-sd/doc/AUTHORS
  A gpu-sd/doc/CMakeLists.txt
  A gpu-sd/doc/Doxyfile.in
  A gpu-sd/doc/DoxygenLayout.xml
  A gpu-sd/doc/GPL.txt
  A gpu-sd/doc/LGPL.txt
  A gpu-sd/doc/RelNotes.dox
  A gpu-sd/doc/doxyfooter.html
  A gpu-sd/libs/CMakeLists.txt
  A gpu-sd/libs/gpusd/CMakeLists.txt
  A gpu-sd/libs/gpusd/api.h
  A gpu-sd/libs/gpusd/cgl/CMakeLists.txt
  A gpu-sd/libs/gpusd/cgl/module.cpp
  A gpu-sd/libs/gpusd/cgl/module.h
  A gpu-sd/libs/gpusd/dns_sd/CMakeLists.txt
  A gpu-sd/libs/gpusd/dns_sd/module.cpp
  A gpu-sd/libs/gpusd/dns_sd/module.h
  A gpu-sd/libs/gpusd/filter.cpp
  A gpu-sd/libs/gpusd/filter.h
  A gpu-sd/libs/gpusd/glx/CMakeLists.txt
  A gpu-sd/libs/gpusd/glx/module.cpp
  A gpu-sd/libs/gpusd/glx/module.h
  A gpu-sd/libs/gpusd/gpuInfo.h
  A gpu-sd/libs/gpusd/module.cpp
  A gpu-sd/libs/gpusd/module.h
  A gpu-sd/libs/gpusd/types.h
  A gpu-sd/libs/gpusd/version.cpp
  A gpu-sd/libs/gpusd/version.in.h
  A gpu-sd/libs/gpusd/wgl/CMakeLists.txt
  A gpu-sd/libs/gpusd/wgl/module.cpp
  A gpu-sd/libs/gpusd/wgl/module.h
  M libs/co/objectDataIStream.cpp
  M libs/co/socketConnection.cpp
  M libs/eq/server/channel.cpp
  M libs/eq/server/compound.cpp
  M libs/eq/server/compound.h
  M libs/eq/server/equalizers/loadEqualizer.cpp
  M libs/eq/server/types.h
  M tests/co/base/rng.cpp
  M tests/co/compressor.cpp
  M tests/co/instanceCache.cpp

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

Conflicts:
        gpu-sd


  Commit: 20b5b202dfa3a966c975b1f5612d84a6a2d12cd6
      
https://github.com/Eyescale/Equalizer/commit/20b5b202dfa3a966c975b1f5612d84a6a2d12cd6
  Author: marwan-abdellah <[email protected]>
  Date:   2012-01-18 (Wed, 18 Jan 2012)

  Changed paths:
    M CMake/FindHWLOC.cmake

  Log Message:
  -----------
  Updating FindHWLOC.cmake
[ ] May break build
[ ] May break existing applications (see CHANGES.txt)
[ ] Bugfix
[ ] New Feature
[x] Cleanup
[ ] Optimization
[ ] Documentation


  Commit: 5a8d867a8d741d9de79bb363f08456f5ad936d7d
      
https://github.com/Eyescale/Equalizer/commit/5a8d867a8d741d9de79bb363f08456f5ad936d7d
  Author: Stefan Eilemann <[email protected]>
  Date:   2012-01-18 (Wed, 18 Jan 2012)

  Changed paths:
    M CMake/FindHWLOC.cmake
  M libs/eq/fabric/node.h
  M libs/eq/fabric/node.ipp
  M libs/eq/server/global.cpp
  M libs/eq/server/loader.l
  M libs/eq/server/loader.y

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


  Commit: 47432285e7688171b333aad272a2a9bc0b2b9290
      
https://github.com/Eyescale/Equalizer/commit/47432285e7688171b333aad272a2a9bc0b2b9290
  Author: Stefan Eilemann <[email protected]>
  Date:   2012-01-18 (Wed, 18 Jan 2012)

  Changed paths:
    M CMake/FindCollage.cmake
  M CMake/FindHWLOC.cmake
  M CMake/FindOFED.cmake
  M libs/eq/server/loader.y

  Log Message:
  -----------
  Merge and find script cleanups

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


Compare: https://github.com/Eyescale/Equalizer/compare/f03f364...4743228
------------------------------------------------------------------------------
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

Reply via email to