Branch: refs/heads/errorevents
  Home:   https://github.com/Eyescale/Equalizer
  Commit: 72ff264774604c5b072826cc9df85dd0da2482e5
      
https://github.com/Eyescale/Equalizer/commit/72ff264774604c5b072826cc9df85dd0da2482e5
  Author: Stefan Eilemann <[email protected]>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    M CMake/FindPackagesPost.cmake
    M CMake/configure.cmake
    M CMakeLists.txt
    M eq/CMakeLists.txt
    M eq/client/CMakeLists.txt
    M eq/client/agl/eventHandler.h
    M eq/client/agl/messagePump.h
    M eq/client/agl/pipe.h
    M eq/client/agl/window.h
    M eq/client/agl/windowEvent.h
    M eq/client/agl/windowSystem.cpp
    M eq/client/api.h
    R eq/client/defines.h
    M eq/client/files.cmake
    M eq/client/types.h
    A eq/defines.h
    M eq/fabric/CMakeLists.txt
    R eq/fabric/configure.cmake
    R eq/fabric/defines.h
    M eq/fabric/equalizerTypes.h
    M eq/fabric/files.cmake
    M eq/server/api.h
    M examples/CMakeLists.txt
    M examples/eqPly/CMakeLists.txt
    M examples/eqPly/plyfile.cpp
    M tests/CMakeLists.txt

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


  Commit: 657fa27678bf658beb58e2d0d5caf38eff119369
      
https://github.com/Eyescale/Equalizer/commit/657fa27678bf658beb58e2d0d5caf38eff119369
  Author: Stefan Eilemann <[email protected]>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    M eq/client/agl/window.cpp
    M eq/client/channel.cpp
    M eq/client/channel.h
    M eq/client/config.cpp
    M eq/client/node.h
    M eq/server/config.cpp
    M eq/server/config.h
    M eq/server/node.cpp

  Log Message:
  -----------
  CR #247


  Commit: 32f01053dd7f7483fbec1a18cd71d50ce8dd4f49
      
https://github.com/Eyescale/Equalizer/commit/32f01053dd7f7483fbec1a18cd71d50ce8dd4f49
  Author: Stefan Eilemann <[email protected]>
  Date:   2013-08-18 (Sun, 18 Aug 2013)

  Changed paths:
    M CMake/Common.cmake
    M eq/client/agl/window.cpp
    M eq/client/channel.cpp
    M eq/client/compressor/compressorReadDrawPixels.cpp
    M eq/client/compressor/compressorYUV.cpp
    M eq/client/error.h
    M eq/client/glWindow.cpp
    M eq/client/image.cpp
    M eq/client/roiFinder.cpp
    M eq/client/systemWindow.h
    M eq/fabric/channel.h
    M eq/fabric/error.cpp
    M eq/fabric/error.h
    M eq/util/accumBufferObject.cpp
    M eq/util/frameBufferObject.cpp
    M eq/util/frameBufferObject.h
    M eq/util/pixelBufferObject.cpp
    M examples/eqPly/plyfile.cpp

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

Conflicts:
        eq/client/agl/window.cpp
        eq/client/channel.cpp


  Commit: 3b7ccd656e61d23790c7b081e219fc327d37e86c
      
https://github.com/Eyescale/Equalizer/commit/3b7ccd656e61d23790c7b081e219fc327d37e86c
  Author: Stefan Eilemann <[email protected]>
  Date:   2013-08-18 (Sun, 18 Aug 2013)

  Changed paths:
    M eq/client/config.cpp

  Log Message:
  -----------
  Fix build


Compare: 
https://github.com/Eyescale/Equalizer/compare/40aee315506a...3b7ccd656e61
------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with <2% overhead. 
Download for free and get started troubleshooting in minutes. 
http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk
_______________________________________________
Equalizer-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/equalizer-commit
http://www.equalizergraphics.com

Reply via email to