Branch: refs/heads/master
  Home:   https://github.com/Eyescale/Equalizer
  Commit: 385fc9a36446b9f67a7925f81b39d56cd4b74779
      
https://github.com/Eyescale/Equalizer/commit/385fc9a36446b9f67a7925f81b39d56cd4b74779
  Author: Stefan Eilemann <[email protected]>
  Date:   2012-10-26 (Fri, 26 Oct 2012)

  Changed paths:
    M CMakeLists.txt
    M examples/eqPixelBench/channel.cpp
    M libs/eq/client/commandQueue.cpp
    M libs/eq/client/gl.h
    M libs/eq/client/image.cpp
    M libs/eq/client/image.h
    M libs/eq/util/gpuCompressor.cpp
    M libs/eq/util/gpuCompressor.h
    M libs/eq/util/texture.cpp

  Log Message:
  -----------
  API cleanup (#159)


  Commit: 54afd005c91ebf504e6f5ca2c3f7e72dc49a484c
      
https://github.com/Eyescale/Equalizer/commit/54afd005c91ebf504e6f5ca2c3f7e72dc49a484c
  Author: Stefan Eilemann <[email protected]>
  Date:   2012-10-26 (Fri, 26 Oct 2012)

  Changed paths:
    M examples/eqPixelBench/channel.cpp
    M libs/eq/client/gl.h
    M libs/eq/client/image.cpp
    M libs/eq/client/image.h
    M libs/eq/util/gpuCompressor.cpp
    M libs/eq/util/gpuCompressor.h
    M libs/eq/util/texture.cpp

  Log Message:
  -----------
  Merge branch '1.4'

Conflicts:
        examples/eqPixelBench/channel.cpp
        libs/eq/client/commandQueue.cpp
        libs/eq/util/gpuCompressor.cpp


Compare: 
https://github.com/Eyescale/Equalizer/compare/50bec11b4e18...54afd005c91e
------------------------------------------------------------------------------
The Windows 8 Center 
In partnership with Sourceforge
Your idea - your app - 30 days. Get started!
http://windows8center.sourceforge.net/
what-html-developers-need-to-know-about-coding-windows-8-metro-style-apps/
_______________________________________________
Equalizer-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/equalizer-commit
http://www.equalizergraphics.com

Reply via email to