[eq-commit] [Eyescale/Equalizer] 4defe2: Merge branch 'master' of https://github.com/Eyesca...

[GitHub <no...@gi...>]

  Branch: refs/heads/master
  Home:   https://github.com/Eyescale/Equalizer
  Commit: 4defe216c1baf08e8ab9e316e61bb75ec2394302
      https://github.com/Eyescale/Equalizer/commit/4defe216c1baf08e8ab9e316e61bb75ec2394302
  Author: Daniel Nachbaur <dan...@gm...>
  Date:   2013-01-16 (Wed, 16 Jan 2013)

  Changed paths:
    M eq/client/window.cpp
    M eq/client/window.h

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


  Commit: 77e12884faf90d50a5bcfb0be4d1ef26841a82a3
      https://github.com/Eyescale/Equalizer/commit/77e12884faf90d50a5bcfb0be4d1ef26841a82a3
  Author: Daniel Nachbaur <dan...@gm...>
  Date:   2013-01-16 (Wed, 16 Jan 2013)

  Changed paths:
    M eq/client/global.h

  Log Message:
  -----------
  Merge branch 'master' of github.com:tribal-tec/Equalizer


  Commit: 1a08e68f637e28c122ebe319e8acf3b109a9512e
      https://github.com/Eyescale/Equalizer/commit/1a08e68f637e28c122ebe319e8acf3b109a9512e
  Author: Daniel Nachbaur <dan...@gm...>
  Date:   2013-01-19 (Sat, 19 Jan 2013)

  Changed paths:
    M CMake/Common.cmake
    A CMake/FindGTS.cmake
    A CMake/FindMaya.cmake
    M CMake/FindPackages.cmake
    M CMake/PackageConfig.cmake
    M eq/client/CMakeLists.txt
    M eq/client/agl/eventHandler.cpp
    M eq/client/client.h
    M eq/client/configStatistics.cpp
    M eq/client/init.cpp
    M eq/client/nodeStatistics.cpp
    M eq/client/pipe.cpp
    M eq/fabric/canvas.ipp
    M eq/fabric/config.ipp
    M eq/fabric/configure.cmake
    M eq/fabric/eye.h
    M eq/fabric/frustum.cpp
    M eq/fabric/frustum.h
    M eq/fabric/observer.h
    M eq/fabric/observer.ipp
    M eq/fabric/segment.h
    M eq/fabric/segment.ipp
    M eq/fabric/view.h
    M eq/fabric/view.ipp
    M eq/server/CMakeLists.txt
    M eq/server/compound.cpp
    M eq/server/config/display.cpp
    M eq/server/config/resources.cpp
    M eq/server/frustum.cpp
    M eq/server/frustum.h
    M eq/server/loader.l
    M eq/server/loader.y
    M eq/server/observer.cpp
    M eq/server/observer.h
    M eq/server/segment.cpp
    M eq/server/segment.h
    M eq/server/startLocalServer.cpp
    M eq/server/view.cpp
    M eq/server/view.h
    M examples/configs/config.eqc
    M examples/eqPly/config.cpp
    M examples/osgScaleViewer/channel.h
    M examples/osgScaleViewer/config.h
    M examples/osgScaleViewer/frameData.h
    M examples/osgScaleViewer/initData.h
    M examples/osgScaleViewer/main.cpp
    M examples/osgScaleViewer/node.h
    M examples/osgScaleViewer/nodeFactory.h
    M examples/osgScaleViewer/osgScaleViewer.h
    M examples/osgScaleViewer/pipe.h
    M examples/osgScaleViewer/sceneReader.h
    M examples/osgScaleViewer/tracker.h
    M examples/osgScaleViewer/window.h

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


  Commit: cea256f94800f1a1ed606acfe1d35edc25cbc890
      https://github.com/Eyescale/Equalizer/commit/cea256f94800f1a1ed606acfe1d35edc25cbc890
  Author: Daniel Nachbaur <dan...@gm...>
  Date:   2013-01-19 (Sat, 19 Jan 2013)

  Changed paths:
    M eq/client/os.h

  Log Message:
  -----------
  Fix osgScaleViewer build on Win32


  Commit: 0b4aa35da955b10dde74163c2625e48376433f42
      https://github.com/Eyescale/Equalizer/commit/0b4aa35da955b10dde74163c2625e48376433f42
  Author: Stefan Eilemann <ei...@ey...>
  Date:   2013-01-19 (Sat, 19 Jan 2013)

  Changed paths:
    M eq/client/os.h

  Log Message:
  -----------
  Merge pull request #197 from tribal-tec/master

Win32 build fix


Compare: https://github.com/Eyescale/Equalizer/compare/da2b9bb64f42...0b4aa35da955