[eq-commit] [Eyescale/Equalizer] d9dec1: Fix API_2_0 build

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

  Branch: refs/heads/master
  Home:   https://github.com/Eyescale/Equalizer
  Commit: d9dec1aa33896d70b3772b75df0f7d83eb59909a
      https://github.com/Eyescale/Equalizer/commit/d9dec1aa33896d70b3772b75df0f7d83eb59909a
  Author: Daniel Nachbaur <dan...@ep...>
  Date:   2013-01-14 (Mon, 14 Jan 2013)

  Changed paths:
    M examples/eqNBody/client.cpp
    M examples/osgScaleViewer/osgScaleViewer.cpp
    M tests/client/configUpdate.cpp

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


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

  Changed paths:
    M eq/client/CMakeLists.txt

  Log Message:
  -----------
  Fix Win32 linking


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

  Changed paths:
    M examples/eqNBody/client.cpp
    M examples/osgScaleViewer/osgScaleViewer.cpp
    M tests/client/configUpdate.cpp

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


  Commit: bade76d94dc61eca83153b8b9e03b184e3025c76
      https://github.com/Eyescale/Equalizer/commit/bade76d94dc61eca83153b8b9e03b184e3025c76
  Author: Daniel Nachbaur <dan...@ep...>
  Date:   2013-01-15 (Tue, 15 Jan 2013)

  Changed paths:
    M eq/server/config/resources.cpp
    M eq/server/config/server.cpp
    M eq/server/server.cpp

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


  Commit: 6b14892246f69fe4d3d2e3893ffb4590e777881d
      https://github.com/Eyescale/Equalizer/commit/6b14892246f69fe4d3d2e3893ffb4590e777881d
  Author: Daniel Nachbaur <dan...@ep...>
  Date:   2013-01-15 (Tue, 15 Jan 2013)

  Changed paths:
    M eq/client/CMakeLists.txt

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


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

  Changed paths:
    M CMake/PackageConfig.cmake
    M GNUmakefile
    M eq/client/channel.cpp
    M eq/client/config.cpp
    M eq/client/event.cpp
    M eq/client/nodeStatistics.cpp
    M eq/client/pipe.cpp
    M eq/client/server.cpp
    M eq/client/statisticSampler.h
    M eq/client/wgl/eventHandler.cpp
    M eq/fabric/canvas.ipp
    M eq/fabric/channel.h
    M eq/fabric/channel.ipp
    M eq/fabric/config.ipp
    M eq/fabric/object.cpp
    M eq/fabric/segment.ipp
    M eq/fabric/view.ipp
    M eq/server/channelUpdateVisitor.cpp
    M eq/server/config.cpp
    M eq/server/config/resources.cpp
    M eq/server/config/server.cpp
    M eq/server/server.cpp
    M eq/server/tileQueue.cpp
    M examples/CMakeLists.txt
    M examples/eVolve/config.cpp
    M examples/eVolve/frameData.cpp
    M examples/eVolve/initData.cpp
    M examples/eqNBody/config.cpp
    M examples/eqNBody/initData.cpp
    M examples/eqPly/channel.cpp
    M examples/eqPly/config.cpp
    M examples/eqPly/frameData.cpp
    M examples/eqPly/initData.cpp
    M examples/eqPly/vertexBufferDist.cpp
    M examples/eqPly/view.cpp
    M examples/osgScaleViewer/config.cpp
    M examples/osgScaleViewer/initData.cpp
    M examples/osgScaleViewer/initData.h
    M examples/seqPly/application.cpp
    M seq/detail/channel.h
    M seq/detail/masterConfig.cpp
    M seq/detail/objectMap.cpp
    M seq/detail/window.h
    M seq/types.h

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


  Commit: 266a039e2176c43afef307ab42d21574763a58b9
      https://github.com/Eyescale/Equalizer/commit/266a039e2176c43afef307ab42d21574763a58b9
  Author: Daniel Nachbaur <dan...@gm...>
  Date:   2013-01-15 (Tue, 15 Jan 2013)

  Changed paths:
    M examples/osgScaleViewer/CMakeLists.txt
    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:
  -----------
  Fix Win32 build


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

  Changed paths:
    M eq/client/CMakeLists.txt

  Log Message:
  -----------
  Fix install location


  Commit: 43fc7381e0652b9d07d225bac57ad0fa6ff03b4d
      https://github.com/Eyescale/Equalizer/commit/43fc7381e0652b9d07d225bac57ad0fa6ff03b4d
  Author: Stefan Eilemann <Ste...@ep...>
  Date:   2013-01-15 (Tue, 15 Jan 2013)

  Changed paths:
    M CMake/PackageConfig.cmake
    M GNUmakefile
    M eq/client/channel.cpp
    M eq/client/config.cpp
    M eq/client/event.cpp
    M eq/client/nodeStatistics.cpp
    M eq/client/pipe.cpp
    M eq/client/server.cpp
    M eq/client/statisticSampler.h
    M eq/client/wgl/eventHandler.cpp
    M eq/client/window.cpp
    M eq/client/window.h
    M eq/fabric/canvas.ipp
    M eq/fabric/channel.h
    M eq/fabric/channel.ipp
    M eq/fabric/config.ipp
    M eq/fabric/object.cpp
    M eq/fabric/segment.ipp
    M eq/fabric/view.ipp
    M eq/server/channelUpdateVisitor.cpp
    M eq/server/config.cpp
    M eq/server/config/resources.cpp
    M eq/server/config/server.cpp
    M eq/server/server.cpp
    M eq/server/tileQueue.cpp
    M examples/CMakeLists.txt
    M examples/eVolve/config.cpp
    M examples/eVolve/frameData.cpp
    M examples/eVolve/initData.cpp
    M examples/eqNBody/config.cpp
    M examples/eqNBody/initData.cpp
    M examples/eqPly/channel.cpp
    M examples/eqPly/config.cpp
    M examples/eqPly/frameData.cpp
    M examples/eqPly/initData.cpp
    M examples/eqPly/vertexBufferDist.cpp
    M examples/eqPly/view.cpp
    M examples/osgScaleViewer/config.cpp
    M examples/osgScaleViewer/initData.cpp
    M examples/osgScaleViewer/initData.h
    M examples/seqPly/application.cpp
    M seq/detail/channel.h
    M seq/detail/masterConfig.cpp
    M seq/detail/objectMap.cpp
    M seq/detail/window.h
    M seq/types.h

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


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

  Changed paths:
    M eq/client/global.h

  Log Message:
  -----------
  Fix icc warning


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

  Changed paths:
    M CMake/PackageConfig.cmake
    M GNUmakefile
    M eq/client/channel.cpp
    M eq/client/config.cpp
    M eq/client/event.cpp
    M eq/client/nodeStatistics.cpp
    M eq/client/pipe.cpp
    M eq/client/server.cpp
    M eq/client/statisticSampler.h
    M eq/client/wgl/eventHandler.cpp
    M eq/client/window.cpp
    M eq/client/window.h
    M eq/fabric/canvas.ipp
    M eq/fabric/channel.h
    M eq/fabric/channel.ipp
    M eq/fabric/config.ipp
    M eq/fabric/object.cpp
    M eq/fabric/segment.ipp
    M eq/fabric/view.ipp
    M eq/server/channelUpdateVisitor.cpp
    M eq/server/config.cpp
    M eq/server/config/resources.cpp
    M eq/server/server.cpp
    M eq/server/tileQueue.cpp
    M examples/CMakeLists.txt
    M examples/eVolve/config.cpp
    M examples/eVolve/frameData.cpp
    M examples/eVolve/initData.cpp
    M examples/eqNBody/config.cpp
    M examples/eqNBody/initData.cpp
    M examples/eqPly/channel.cpp
    M examples/eqPly/config.cpp
    M examples/eqPly/frameData.cpp
    M examples/eqPly/initData.cpp
    M examples/eqPly/vertexBufferDist.cpp
    M examples/eqPly/view.cpp
    M examples/osgScaleViewer/config.cpp
    M examples/osgScaleViewer/initData.cpp
    M examples/osgScaleViewer/initData.h
    M examples/seqPly/application.cpp
    M seq/detail/channel.h
    M seq/detail/masterConfig.cpp
    M seq/detail/objectMap.cpp
    M seq/detail/window.h
    M seq/types.h

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


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

  Changed paths:
    M eq/client/CMakeLists.txt
    M examples/osgScaleViewer/CMakeLists.txt
    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 github.com:tribal-tec/Equalizer


  Commit: db7e53b74fcab0b4d55c231eab0d8d9a6177814c
      https://github.com/Eyescale/Equalizer/commit/db7e53b74fcab0b4d55c231eab0d8d9a6177814c
  Author: Stefan Eilemann <Ste...@ep...>
  Date:   2013-01-16 (Wed, 16 Jan 2013)

  Changed paths:
    M eq/fabric/canvas.ipp
    M eq/fabric/frustum.cpp
    M eq/fabric/frustum.h
    M eq/fabric/segment.h
    M eq/fabric/segment.ipp
    M eq/fabric/view.h
    M eq/fabric/view.ipp
    M eq/server/compound.cpp
    M eq/server/frustum.cpp
    M eq/server/frustum.h
    M eq/server/view.cpp

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


  Commit: b2d9de76e4050f4146436997b0e59972a45996aa
      https://github.com/Eyescale/Equalizer/commit/b2d9de76e4050f4146436997b0e59972a45996aa
  Author: Stefan Eilemann <Ste...@ep...>
  Date:   2013-01-17 (Thu, 17 Jan 2013)

  Changed paths:
    M eq/client/CMakeLists.txt
    M eq/client/global.h
    M examples/osgScaleViewer/CMakeLists.txt
    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/tribal-tec/Equalizer


  Commit: daa5c910fd9382b2eb6afa23c78f5e8a7ed7d471
      https://github.com/Eyescale/Equalizer/commit/daa5c910fd9382b2eb6afa23c78f5e8a7ed7d471
  Author: Stefan Eilemann <Ste...@ep...>
  Date:   2013-01-17 (Thu, 17 Jan 2013)

  Changed paths:
    M CMake/FindPackages.cmake
    M eq/client/CMakeLists.txt
    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 cleanup


Compare: https://github.com/Eyescale/Equalizer/compare/bbd86e6fa443...daa5c910fd93