Branch: refs/heads/plugins
  Home:   https://github.com/Eyescale/Equalizer
  Commit: 312e72217092e7dd9b960a9cf4af2f47fef7f06e
      
https://github.com/Eyescale/Equalizer/commit/312e72217092e7dd9b960a9cf4af2f47fef7f06e
  Author: Stefan Eilemann <[email protected]>
  Date:   2013-02-25 (Mon, 25 Feb 2013)

  Changed paths:
    M examples/eqPly/config.cpp
    M examples/seqPly/application.cpp
    M tests/client/imageIO.cpp
    M tests/compressor/image.cpp
    M tests/server/loader/examples.cpp
    M tests/server/reliability_gpu.cpp
    M tools/eqPlyConverter/main.cpp

  Log Message:
  -----------
  Fix unit tests


  Commit: 13a98a35227b0f945d4a4afd2c8b4e6779692c42
      
https://github.com/Eyescale/Equalizer/commit/13a98a35227b0f945d4a4afd2c8b4e6779692c42
  Author: Stefan Eilemann <[email protected]>
  Date:   2013-02-25 (Mon, 25 Feb 2013)

  Changed paths:
    M examples/eqPly/config.cpp
    M examples/seqPly/application.cpp
    M tests/client/imageIO.cpp
    M tests/compressor/image.cpp
    M tests/server/loader/examples.cpp
    M tests/server/reliability_gpu.cpp
    M tools/eqPlyConverter/main.cpp

  Log Message:
  -----------
  Merge branch 'master' into plugins

Conflicts:
        tests/compressor/image.cpp


  Commit: f0513761bc0eff34bbbb1a91086323062ec1b80d
      
https://github.com/Eyescale/Equalizer/commit/f0513761bc0eff34bbbb1a91086323062ec1b80d
  Author: Stefan Eilemann <[email protected]>
  Date:   2013-02-25 (Mon, 25 Feb 2013)

  Changed paths:
    M tests/compressor/image.cpp

  Log Message:
  -----------
  Missing chunk for last merge


Compare: 
https://github.com/Eyescale/Equalizer/compare/c2eef762a22d...f0513761bc0e
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_feb
_______________________________________________
Equalizer-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/equalizer-commit
http://www.equalizergraphics.com

Reply via email to