Branch: refs/heads/Collage
  Home:   https://github.com/Eyescale/Equalizer
  Commit: 988d2a5fac6e7ba7b8c06b9b94ec5e4f397562d4
      
https://github.com/Eyescale/Equalizer/commit/988d2a5fac6e7ba7b8c06b9b94ec5e4f397562d4
  Author: Stefan Eilemann <[email protected]>
  Date:   2012-07-31 (Tue, 31 Jul 2012)

  Changed paths:
    M examples/CMakeLists.txt
    M libs/eq/client/base.h
    M libs/eq/client/channel.cpp
    M libs/eq/client/channel.h
    M libs/eq/client/compositor.cpp
    M libs/eq/client/compositor.h
    M libs/eq/client/compressor/compressorYUV.h
    M libs/eq/client/glWindow.cpp
    M libs/eq/client/glx/windowEvent.h
    M libs/eq/client/image.cpp
    M libs/eq/client/roiFinder.cpp
    M libs/eq/client/window.cpp
    M libs/eq/client/window.h
    M libs/eq/client/windowSystem.cpp
    M libs/eq/client/zoomFilter.h
    M libs/eq/util/accum.cpp
    M libs/eq/util/accum.h
    M libs/eq/util/accumBufferObject.cpp
    M libs/eq/util/accumBufferObject.h
    M libs/eq/util/bitmapFont.ipp
    M libs/eq/util/frameBufferObject.cpp
    M libs/eq/util/frameBufferObject.h
    M libs/eq/util/objectManager.h
    M libs/eq/util/texture.cpp
    M libs/eq/util/texture.h
    M libs/seq/detail/channel.cpp
    M tools/CMakeLists.txt

  Log Message:
  -----------
  Hide GL types from public API, unless EQ_SYSTEM_INCLUDES is set


  Commit: 0aef7a49f36fc495eb0fa9ee334453aba7801665
      
https://github.com/Eyescale/Equalizer/commit/0aef7a49f36fc495eb0fa9ee334453aba7801665
  Author: Stefan Eilemann <[email protected]>
  Date:   2012-07-31 (Tue, 31 Jul 2012)

  Changed paths:
    M examples/CMakeLists.txt
    M libs/eq/client/base.h
    M libs/eq/client/channel.cpp
    M libs/eq/client/channel.h
    M libs/eq/client/compositor.cpp
    M libs/eq/client/compositor.h
    M libs/eq/client/compressor/compressorYUV.h
    M libs/eq/client/glWindow.cpp
    M libs/eq/client/glx/windowEvent.h
    M libs/eq/client/image.cpp
    M libs/eq/client/roiFinder.cpp
    M libs/eq/client/window.cpp
    M libs/eq/client/window.h
    M libs/eq/client/windowSystem.cpp
    M libs/eq/client/zoomFilter.h
    M libs/eq/util/accum.cpp
    M libs/eq/util/accum.h
    M libs/eq/util/accumBufferObject.cpp
    M libs/eq/util/accumBufferObject.h
    M libs/eq/util/bitmapFont.ipp
    M libs/eq/util/frameBufferObject.cpp
    M libs/eq/util/frameBufferObject.h
    M libs/eq/util/objectManager.h
    M libs/eq/util/texture.cpp
    M libs/eq/util/texture.h
    M libs/seq/detail/channel.cpp
    M tools/CMakeLists.txt

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


  Commit: 1904aa428309120f7a164abc8d474531112718d4
      
https://github.com/Eyescale/Equalizer/commit/1904aa428309120f7a164abc8d474531112718d4
  Author: Stefan Eilemann <[email protected]>
  Date:   2012-07-31 (Tue, 31 Jul 2012)

  Changed paths:
    M examples/CMakeLists.txt
    M libs/eq/client/base.h
    M libs/eq/client/channel.cpp
    M libs/eq/client/channel.h
    M libs/eq/client/compositor.cpp
    M libs/eq/client/compositor.h
    M libs/eq/client/compressor/compressorYUV.h
    M libs/eq/client/glWindow.cpp
    M libs/eq/client/glx/windowEvent.h
    M libs/eq/client/image.cpp
    M libs/eq/client/roiFinder.cpp
    M libs/eq/client/window.cpp
    M libs/eq/client/window.h
    M libs/eq/client/windowSystem.cpp
    M libs/eq/client/zoomFilter.h
    M libs/eq/util/accum.cpp
    M libs/eq/util/accum.h
    M libs/eq/util/accumBufferObject.cpp
    M libs/eq/util/accumBufferObject.h
    M libs/eq/util/bitmapFont.ipp
    M libs/eq/util/frameBufferObject.cpp
    M libs/eq/util/frameBufferObject.h
    M libs/eq/util/objectManager.h
    M libs/eq/util/texture.cpp
    M libs/eq/util/texture.h
    M libs/seq/detail/channel.cpp
    M tools/CMakeLists.txt

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


Compare: 
https://github.com/Eyescale/Equalizer/compare/eec250192180...1904aa428309
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Equalizer-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/equalizer-commit
http://www.equalizergraphics.com

Reply via email to