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

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

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

  Changed paths:
    M doc/CMakeLists.txt
    R doc/Doxyfile.Collage
    M doc/Doxyfile.int
    M examples/eqNBody/node.cpp

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


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

  Changed paths:
    A CMake/2.8.8/BasicConfigVersion-AnyNewerVersion.cmake.in
    A CMake/2.8.8/BasicConfigVersion-ExactVersion.cmake.in
    A CMake/2.8.8/BasicConfigVersion-SameMajorVersion.cmake.in
    M CMake/2.8.8/WriteBasicConfigVersionFile.cmake
    M CMake/Common.cmake
    M CMake/FindPackages.cmake
    A CMake/InstallFiles.cmake
    M CMake/PackageConfig.cmake
    R CMake/ParseArguments.cmake
    R CMake/PurpleAddLibrary.cmake
    R CMake/PurpleDoxygen.cmake
    R CMake/PurpleExpandLibraries.cmake
    M eq/client/CMakeLists.txt
    M eq/server/config.h
    M eq/server/node.h
    M eq/util/files.cmake
    M examples/CMakeLists.txt
    M tools/CMakeLists.txt

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


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

  Changed paths:
    M GLEW/CMakeLists.txt
    M tools/CMakeLists.txt

  Log Message:
  -----------
  Fix warning; compiler definitions are not allowed to have dashes


Compare: https://github.com/Eyescale/Equalizer/compare/cbfdccd9003a...d1394a0933d6