[eq-commit] [Eyescale/Equalizer] ff0b36: Fix S&R bug

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

  Branch: refs/heads/GLStats
  Home:   https://github.com/Eyescale/Equalizer
  Commit: ff0b360c49436b18c426125366f61e1742c0765d
      https://github.com/Eyescale/Equalizer/commit/ff0b360c49436b18c426125366f61e1742c0765d
  Author: Stefan Eilemann <eil...@gm...>
  Date:   2012-06-12 (Tue, 12 Jun 2012)

  Changed paths:
    M libs/eq/client/image.cpp

  Log Message:
  -----------
  Fix S&R bug


  Commit: 9cddafdfc680d51a78f2294e3c8427b94369c99b
      https://github.com/Eyescale/Equalizer/commit/9cddafdfc680d51a78f2294e3c8427b94369c99b
  Author: Stefan Eilemann <eil...@gm...>
  Date:   2012-06-12 (Tue, 12 Jun 2012)

  Changed paths:
    M CMakeLists.txt
    M libs/CMakeLists.txt

  Log Message:
  -----------
  Fix Windows build with preinstalled Boost


  Commit: 096ef5d66335dc1058bdd1fa4bbecd5b03511b9f
      https://github.com/Eyescale/Equalizer/commit/096ef5d66335dc1058bdd1fa4bbecd5b03511b9f
  Author: Stefan Eilemann <eil...@gm...>
  Date:   2012-06-13 (Wed, 13 Jun 2012)

  Changed paths:
    M libs/eq/server/startLocalServer.cpp

  Log Message:
  -----------
  Deactive assertion, needs more elaborate fix


  Commit: 4dae4542c3a60688ad8aa0e86fdacc27ee550010
      https://github.com/Eyescale/Equalizer/commit/4dae4542c3a60688ad8aa0e86fdacc27ee550010
  Author: Stefan Eilemann <eil...@gm...>
  Date:   2012-06-13 (Wed, 13 Jun 2012)

  Changed paths:
    M CMakeLists.txt
    M libs/CMakeLists.txt
    M libs/eq/client/image.cpp

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


  Commit: 7dfae6c7eb77a695aa8f8575902ae6fe7ae6f97b
      https://github.com/Eyescale/Equalizer/commit/7dfae6c7eb77a695aa8f8575902ae6fe7ae6f97b
  Author: Stefan Eilemann <eil...@gm...>
  Date:   2012-06-13 (Wed, 13 Jun 2012)

  Changed paths:
    M CMakeLists.txt
    M libs/CMakeLists.txt
    M libs/eq/client/image.cpp
    M libs/eq/server/startLocalServer.cpp

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


Compare: https://github.com/Eyescale/Equalizer/compare/c68880387ee5...7dfae6c7eb77