[eq-commit] [Eyescale/Equalizer] 01be9b: Fix cmake run w/ icc

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

  Branch: refs/heads/bullet
  Home:   https://github.com/Eyescale/Equalizer
  Commit: 01be9b8fc8e67ecca5eba637277df1f278f39cd5
      https://github.com/Eyescale/Equalizer/commit/01be9b8fc8e67ecca5eba637277df1f278f39cd5
  Author: Daniel Nachbaur <dan...@ep...>
  Date:   2013-04-16 (Tue, 16 Apr 2013)

  Changed paths:
    M Compiler.cmake

  Log Message:
  -----------
  Fix cmake run w/ icc


  Commit: d4529cf3507284d1589a5e075de1997061740b3f
      https://github.com/Eyescale/Equalizer/commit/d4529cf3507284d1589a5e075de1997061740b3f
  Author: Stefan Eilemann <ei...@ey...>
  Date:   2013-04-17 (Wed, 17 Apr 2013)

  Changed paths:
    M Compiler.cmake

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

Fix cmake run w/ icc


  Commit: 50069dfd517892e1fc9d6d1213b40e376ebb5b9c
      https://github.com/Eyescale/Equalizer/commit/50069dfd517892e1fc9d6d1213b40e376ebb5b9c
  Author: Stefan Eilemann <Ste...@ep...>
  Date:   2013-04-23 (Tue, 23 Apr 2013)

  Changed paths:
    M DoxygenRule.cmake

  Log Message:
  -----------
  Cleanup


  Commit: d3dbd09c517f8a5fc54509019a8bdd17df1c4ca9
      https://github.com/Eyescale/Equalizer/commit/d3dbd09c517f8a5fc54509019a8bdd17df1c4ca9
  Author: Stefan Eilemann <Ste...@ep...>
  Date:   2013-04-23 (Tue, 23 Apr 2013)

  Changed paths:
    M DoxygenRule.cmake

  Log Message:
  -----------
  Tweak configurability of documentation repo


  Commit: dd069cb42d99fb51d6ce52609086e29d13d0faf5
      https://github.com/Eyescale/Equalizer/commit/dd069cb42d99fb51d6ce52609086e29d13d0faf5
  Author: Stefan Eilemann <Ste...@ep...>
  Date:   2013-04-23 (Tue, 23 Apr 2013)

  Changed paths:
    M DoxygenRule.cmake

  Log Message:
  -----------
  Tweak configurability of documentation repo


  Commit: a675ff515eb3d8470b69347513ff9f27610e3a86
      https://github.com/Eyescale/Equalizer/commit/a675ff515eb3d8470b69347513ff9f27610e3a86
  Author: Stefan Eilemann <Ste...@ep...>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M DoxygenRule.cmake
    A Doxygit.cmake

  Log Message:
  -----------
  Integrate doxygit repo update with doxygit rule


  Commit: df7d323718593df000a01a77683e1c87e7c14344
      https://github.com/Eyescale/Equalizer/commit/df7d323718593df000a01a77683e1c87e7c14344
  Author: Stefan Eilemann <Ste...@ep...>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M DoxygenRule.cmake
    M Doxygit.cmake

  Log Message:
  -----------
  Fix integrate doxygit repo update with doxygit rule


  Commit: 7e86afdec1acac127470725fa1293d7fc8ed1b53
      https://github.com/Eyescale/Equalizer/commit/7e86afdec1acac127470725fa1293d7fc8ed1b53
  Author: Stefan Eilemann <Ste...@ep...>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M Doxygit.cmake
    R github.cmake

  Log Message:
  -----------
  Fold github functionality into new Doxygit script


  Commit: 63103f0a0003b71ca60903acc96239ce88d57eb7
      https://github.com/Eyescale/Equalizer/commit/63103f0a0003b71ca60903acc96239ce88d57eb7
  Author: Stefan Eilemann <Ste...@ep...>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    A github.cmake

  Log Message:
  -----------
  Bring back github.cmake using new Doxygit


  Commit: 6438c0fb791f80fee1049e7293b09f50b71d8129
      https://github.com/Eyescale/Equalizer/commit/6438c0fb791f80fee1049e7293b09f50b71d8129
  Author: Stefan Eilemann <Ste...@ep...>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M Doxygit.cmake

  Log Message:
  -----------
  Tweak image size


  Commit: 9d6abc90cc729404339c7e29510ad25f63cf4379
      https://github.com/Eyescale/Equalizer/commit/9d6abc90cc729404339c7e29510ad25f63cf4379
  Author: Juan Hernando <jhe...@fi...>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M DoxygenRule.cmake

  Log Message:
  -----------
  Allow a user defined name for the doxygen config file.
Otherwise DoxygenRule must be included from the top level CMakeLists.txt and the file must be doc/Doxyfile.


  Commit: 0dbabe4ec1a1331c248783bbf7651001212b9441
      https://github.com/Eyescale/Equalizer/commit/0dbabe4ec1a1331c248783bbf7651001212b9441
  Author: Stefan Eilemann <ei...@ey...>
  Date:   2013-04-25 (Thu, 25 Apr 2013)

  Changed paths:
    M DoxygenRule.cmake

  Log Message:
  -----------
  Merge pull request #17 from hernando/master

Declared DOXYGEN_CONFIG_FILE to let the user decide the name and location of the doxygen config file


  Commit: 96f2dee0428dd41679e9bb21b352e2fc2852c408
      https://github.com/Eyescale/Equalizer/commit/96f2dee0428dd41679e9bb21b352e2fc2852c408
  Author: Stefan Eilemann <Ste...@ep...>
  Date:   2013-04-25 (Thu, 25 Apr 2013)

  Changed paths:
    M Common.cmake

  Log Message:
  -----------
  Default boost define for unit tests


  Commit: ccfefd48e8c134177b546735b2e08135ecc926b0
      https://github.com/Eyescale/Equalizer/commit/ccfefd48e8c134177b546735b2e08135ecc926b0
  Author: Stefan Eilemann <Ste...@ep...>
  Date:   2013-04-25 (Thu, 25 Apr 2013)

  Changed paths:
    M DoxygenRule.cmake

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


  Commit: 0e31c59b2c1058cb3ed5042e2df61b4bcb0aab92
      https://github.com/Eyescale/Equalizer/commit/0e31c59b2c1058cb3ed5042e2df61b4bcb0aab92
  Author: Stefan Eilemann <Ste...@ep...>
  Date:   2013-04-29 (Mon, 29 Apr 2013)

  Changed paths:
    M Doxygit.cmake

  Log Message:
  -----------
  Allow documentation table customization


  Commit: 45209b46d5045d85b29c300dd9ec973a12f46377
      https://github.com/Eyescale/Equalizer/commit/45209b46d5045d85b29c300dd9ec973a12f46377
  Author: Stefan Eilemann <Ste...@ep...>
  Date:   2013-04-29 (Mon, 29 Apr 2013)

  Changed paths:
    M Doxygit.cmake

  Log Message:
  -----------
  Tweak documentation table customization


  Commit: 7e7262874d94ad8fc3e06b7d3676d9e64590a590
      https://github.com/Eyescale/Equalizer/commit/7e7262874d94ad8fc3e06b7d3676d9e64590a590
  Author: Stefan Eilemann <Ste...@ep...>
  Date:   2013-04-29 (Mon, 29 Apr 2013)

  Changed paths:
    M Common.cmake
    M DoxygenRule.cmake
    M Doxygit.cmake

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


  Commit: 48961a215caf6b21b02d25c9abc5c8c49965c0f0
      https://github.com/Eyescale/Equalizer/commit/48961a215caf6b21b02d25c9abc5c8c49965c0f0
  Author: Daniel Nachbaur <dan...@ep...>
  Date:   2013-04-29 (Mon, 29 Apr 2013)

  Changed paths:
    M DoxygenRule.cmake
    M Doxygit.cmake

  Log Message:
  -----------
  Fix doxygit


  Commit: aa5f6295ae73b907e10c000a22a8822c26960ffc
      https://github.com/Eyescale/Equalizer/commit/aa5f6295ae73b907e10c000a22a8822c26960ffc
  Author: Stefan Eilemann <ei...@ey...>
  Date:   2013-04-29 (Mon, 29 Apr 2013)

  Changed paths:
    M DoxygenRule.cmake
    M Doxygit.cmake

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

Fix doxygit


  Commit: 3ed76946a10d80999339cfa8b8429fa421923136
      https://github.com/Eyescale/Equalizer/commit/3ed76946a10d80999339cfa8b8429fa421923136
  Author: Daniel Nachbaur <dan...@ep...>
  Date:   2013-04-30 (Tue, 30 Apr 2013)

  Changed paths:
    M CommonCPack.cmake

  Log Message:
  -----------
  Setup CPACK_DEBIAN_BUILD_DEPENDS from Buildyard config _DEBS


  Commit: ce973d44ad075600770c07d9de9023ef04aad920
      https://github.com/Eyescale/Equalizer/commit/ce973d44ad075600770c07d9de9023ef04aad920
  Author: Stefan Eilemann <ei...@ey...>
  Date:   2013-04-30 (Tue, 30 Apr 2013)

  Changed paths:
    M CommonCPack.cmake

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

Setup CPACK_DEBIAN_BUILD_DEPENDS from Buildyard config _DEBS


  Commit: 4db9ffb2cd8e57811fed5ac68f58fba091a0d12c
      https://github.com/Eyescale/Equalizer/commit/4db9ffb2cd8e57811fed5ac68f58fba091a0d12c
  Author: Daniel Nachbaur <dan...@ep...>
  Date:   2013-05-13 (Mon, 13 May 2013)

  Changed paths:
    A FindFFMPEG.cmake
    A FindLibJpegTurbo.cmake
    A LibFindMacros.cmake

  Log Message:
  -----------
  Add finders required for DisplayCluster


  Commit: ea781867daafb0ef9545bfea2530d584629bd28d
      https://github.com/Eyescale/Equalizer/commit/ea781867daafb0ef9545bfea2530d584629bd28d
  Author: Stefan Eilemann <ei...@ey...>
  Date:   2013-05-13 (Mon, 13 May 2013)

  Changed paths:
    A FindFFMPEG.cmake
    A FindLibJpegTurbo.cmake
    A LibFindMacros.cmake

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

Add finders required for DisplayCluster


  Commit: 66de7c76b66163efb6bd4752a9c4f5f866bec548
      https://github.com/Eyescale/Equalizer/commit/66de7c76b66163efb6bd4752a9c4f5f866bec548
  Author: Daniel Nachbaur <dan...@ep...>
  Date:   2013-05-14 (Tue, 14 May 2013)

  Changed paths:
    A FindTUIO.cmake

  Log Message:
  -----------
  Add TUIO finder


  Commit: ba8497feeb7a60f6b06fda84a71502b0709bbb9b
      https://github.com/Eyescale/Equalizer/commit/ba8497feeb7a60f6b06fda84a71502b0709bbb9b
  Author: Daniel Nachbaur <dan...@ep...>
  Date:   2013-05-14 (Tue, 14 May 2013)

  Changed paths:
    A FindDisplayCluster.cmake

  Log Message:
  -----------
  Add DisplayCluster finder


  Commit: 5de6a68f3b5dc321bd84beb3ce99d7419084be68
      https://github.com/Eyescale/Equalizer/commit/5de6a68f3b5dc321bd84beb3ce99d7419084be68
  Author: Stefan Eilemann <Ste...@ep...>
  Date:   2013-05-14 (Tue, 14 May 2013)

  Changed paths:
    M CMake/FindPackages.cmake
    A CMake/FindPackagesPost.cmake
    M CMake/configure.cmake
    M CMakeLists.txt
    M GLEW/CMakeLists.txt
    M doc/Doxyfile.Equalizer
    M doc/Doxyfile.Sequel
    M doc/Doxyfile.int
    M doc/README.OpenMP
    M eq/client/CMakeLists.txt
    M eq/client/agl/eventHandler.cpp
    M eq/client/agl/windowSystem.cpp
    M eq/client/channel.cpp
    M eq/client/config.cpp
    R eq/client/configure.cmake
    M eq/client/cudaContext.cpp
    M eq/client/detail/channel.ipp
    M eq/client/files.cmake
    M eq/client/glx/eventHandler.cpp
    M eq/client/glx/messagePump.cpp
    M eq/client/observer.cpp
    M eq/client/pipe.cpp
    M eq/client/wgl/eventHandler.cpp
    M eq/client/wgl/windowSystem.cpp
    M eq/server/CMakeLists.txt
    M eq/server/config/resources.cpp
    M eq/server/server.cpp
    M eq/server/startLocalServer.cpp
    M tools/CMakeLists.txt
    M tools/server/eqServer.cpp

  Log Message:
  -----------
  Streamline package finding with Buildyard


  Commit: b09cdb84f0ccfa3ad212c07ddc0710bafbe499f0
      https://github.com/Eyescale/Equalizer/commit/b09cdb84f0ccfa3ad212c07ddc0710bafbe499f0
  Author: Stefan Eilemann <ei...@ey...>
  Date:   2013-05-14 (Tue, 14 May 2013)

  Changed paths:
    A FindDisplayCluster.cmake
    A FindTUIO.cmake

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

Add DisplayCluster & TUIO finder


  Commit: f51d65126369f9ae989d89957a50a7a544f08ff2
      https://github.com/Eyescale/Equalizer/commit/f51d65126369f9ae989d89957a50a7a544f08ff2
  Author: Stefan Eilemann <Ste...@ep...>
  Date:   2013-05-14 (Tue, 14 May 2013)

  Changed paths:
    M CMake/Common.cmake
    M CMake/CommonCPack.cmake
    M CMake/Compiler.cmake
    M CMake/DoxygenRule.cmake
    A CMake/Doxygit.cmake
    A CMake/FindDisplayCluster.cmake
    A CMake/FindFFMPEG.cmake
    A CMake/FindLibJpegTurbo.cmake
    A CMake/FindTUIO.cmake
    A CMake/LibFindMacros.cmake
    M CMake/github.cmake

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


  Commit: 75afea11a8484ebc3adecc5a7df6c27b7af54002
      https://github.com/Eyescale/Equalizer/commit/75afea11a8484ebc3adecc5a7df6c27b7af54002
  Author: Stefan Eilemann <Ste...@ep...>
  Date:   2013-05-14 (Tue, 14 May 2013)

  Changed paths:
    M CMake/FindPackages.cmake
    M CMake/FindPackagesPost.cmake
    M CMakeLists.txt
    M eq/client/CMakeLists.txt
    M eq/client/glx/windowEvent.h

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


  Commit: e5697ee07eecf2b95a564597b9cc41e8f4735943
      https://github.com/Eyescale/Equalizer/commit/e5697ee07eecf2b95a564597b9cc41e8f4735943
  Author: Stefan Eilemann <Ste...@ep...>
  Date:   2013-05-14 (Tue, 14 May 2013)

  Changed paths:
    M CMake/FindMAGELLAN.cmake

  Log Message:
  -----------
  Fix OSX Spacemouse build


  Commit: cc357cb1ee84be6aaf30274efc31dcddf0f01551
      https://github.com/Eyescale/Equalizer/commit/cc357cb1ee84be6aaf30274efc31dcddf0f01551
  Author: Daniel Nachbaur <dan...@ep...>
  Date:   2013-05-14 (Tue, 14 May 2013)

  Changed paths:
    M CMakeLists.txt
    M eq/client/CMakeLists.txt
    M eq/client/channel.cpp
    A eq/client/dcProxy.cpp
    A eq/client/dcProxy.h
    M eq/client/detail/channel.ipp
    M eq/client/files.cmake
    M eq/fabric/view.h
    M eq/fabric/view.ipp
    M eq/server/loader.l
    M eq/server/loader.y

  Log Message:
  -----------
  Initial DisplayCluster support, including single channel pixel streaming


  Commit: 75b2c999870862bd2a14b7ad1350a2eab11b9e78
      https://github.com/Eyescale/Equalizer/commit/75b2c999870862bd2a14b7ad1350a2eab11b9e78
  Author: Stefan Eilemann <Ste...@ep...>
  Date:   2013-05-14 (Tue, 14 May 2013)

  Changed paths:
    M eq/client/CMakeLists.txt
    M eq/client/dcProxy.cpp

  Log Message:
  -----------
  Merge cleanups


  Commit: e20796b31bf510bde807039aaeb5bade14ca72d1
      https://github.com/Eyescale/Equalizer/commit/e20796b31bf510bde807039aaeb5bade14ca72d1
  Author: Stefan Eilemann <Ste...@ep...>
  Date:   2013-05-15 (Wed, 15 May 2013)

  Changed paths:
    M FindMAGELLAN.cmake

  Log Message:
  -----------
  Generalize Spacemouse Finder


  Commit: 730e75b16317c5ea686c79ea84d95e7b21e1d1fe
      https://github.com/Eyescale/Equalizer/commit/730e75b16317c5ea686c79ea84d95e7b21e1d1fe
  Author: Stefan Eilemann <Ste...@ep...>
  Date:   2013-05-15 (Wed, 15 May 2013)

  Changed paths:
    A FindDisplayCluster.cmake
    A FindTUIO.cmake

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


  Commit: 9427ca4a36e5b0ea04285130b19763046975acbb
      https://github.com/Eyescale/Equalizer/commit/9427ca4a36e5b0ea04285130b19763046975acbb
  Author: Stefan Eilemann <Ste...@ep...>
  Date:   2013-05-15 (Wed, 15 May 2013)

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

  Log Message:
  -----------
  Windows compile fix


  Commit: 72b215565e0c9c384e45842285c1b6a148b869bc
      https://github.com/Eyescale/Equalizer/commit/72b215565e0c9c384e45842285c1b6a148b869bc
  Author: Stefan Eilemann <Ste...@ep...>
  Date:   2013-05-15 (Wed, 15 May 2013)

  Changed paths:
    M CMake/FindMAGELLAN.cmake

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

Conflicts:
	CMake/FindMAGELLAN.cmake


  Commit: 955200ace1127b249cfb97f437febd03e6c036a5
      https://github.com/Eyescale/Equalizer/commit/955200ace1127b249cfb97f437febd03e6c036a5
  Author: Stefan Eilemann <Ste...@ep...>
  Date:   2013-05-15 (Wed, 15 May 2013)

  Changed paths:
    M FindMAGELLAN.cmake

  Log Message:
  -----------
  Tweak magellan Finder


  Commit: 5d3b0195d80a03b5bdac8423c82449110e072652
      https://github.com/Eyescale/Equalizer/commit/5d3b0195d80a03b5bdac8423c82449110e072652
  Author: Stefan Eilemann <Ste...@ep...>
  Date:   2013-05-15 (Wed, 15 May 2013)

  Changed paths:
    M CMake/FindMAGELLAN.cmake

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


  Commit: 17643f82877971cb9ffcce2bac9281f8b95699ce
      https://github.com/Eyescale/Equalizer/commit/17643f82877971cb9ffcce2bac9281f8b95699ce
  Author: Stefan Eilemann <Ste...@ep...>
  Date:   2013-05-15 (Wed, 15 May 2013)

  Changed paths:
    M .travis.yml
    M CMake/FindPackages.cmake
    M CMake/configure.cmake
    M CMakeLists.txt

  Log Message:
  -----------
  Cleanups


  Commit: 20bded4d55a79cf1fef798653ccffb1a3d2674e9
      https://github.com/Eyescale/Equalizer/commit/20bded4d55a79cf1fef798653ccffb1a3d2674e9
  Author: Stefan Eilemann <Ste...@ep...>
  Date:   2013-05-16 (Thu, 16 May 2013)

  Changed paths:
    M CommonCPack.cmake

  Log Message:
  -----------
  Reuse known debs for CPack


  Commit: 7c8bf7b452d9cafd8c49750c173daa7949afba93
      https://github.com/Eyescale/Equalizer/commit/7c8bf7b452d9cafd8c49750c173daa7949afba93
  Author: Stefan Eilemann <Ste...@ep...>
  Date:   2013-05-16 (Thu, 16 May 2013)

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

  Log Message:
  -----------
  Wl4 fix


  Commit: 6472902495256e26e1f37764c16e8b756b3bca55
      https://github.com/Eyescale/Equalizer/commit/6472902495256e26e1f37764c16e8b756b3bca55
  Author: Stefan Eilemann <Ste...@ep...>
  Date:   2013-05-16 (Thu, 16 May 2013)

  Changed paths:
    M UploadPPA.cmake

  Log Message:
  -----------
  Update Ubuntu releases


  Commit: bb7ab6cd74126878e0162f563d4cdee5523c130b
      https://github.com/Eyescale/Equalizer/commit/bb7ab6cd74126878e0162f563d4cdee5523c130b
  Author: Stefan Eilemann <Ste...@ep...>
  Date:   2013-05-17 (Fri, 17 May 2013)

  Changed paths:
    M CMake/FindPackages.cmake
    M CMakeLists.txt

  Log Message:
  -----------
  Revert broken bison/flex detection from Buildyard


  Commit: 18c665a562fefd84619cbe6e65227a25fd9d1a35
      https://github.com/Eyescale/Equalizer/commit/18c665a562fefd84619cbe6e65227a25fd9d1a35
  Author: Stefan Eilemann <Ste...@ep...>
  Date:   2013-05-17 (Fri, 17 May 2013)

  Changed paths:
    M CMake/CommonCPack.cmake
    M CMake/UploadPPA.cmake

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


  Commit: 28240e747030012e4f3c1b316d0bf5a01479e61c
      https://github.com/Eyescale/Equalizer/commit/28240e747030012e4f3c1b316d0bf5a01479e61c
  Author: Stefan Eilemann <Ste...@ep...>
  Date:   2013-05-17 (Fri, 17 May 2013)

  Changed paths:
    A doc/Doxyfile
    R doc/Doxyfile.Equalizer
    A doc/RelNotes.md

  Log Message:
  -----------
  Cleanup doxygen usage and start drafting 1.6 release notes


  Commit: 220bb123c7313599636dbdd7be15a54b76821213
      https://github.com/Eyescale/Equalizer/commit/220bb123c7313599636dbdd7be15a54b76821213
  Author: Stefan Eilemann <Ste...@ep...>
  Date:   2013-05-17 (Fri, 17 May 2013)

  Changed paths:
    M CMakeLists.txt
    M doc/CMakeLists.txt
    M doc/Doxyfile
    R doc/Doxyfile.Sequel
    R doc/Doxyfile.int
    M doc/RelNotes.dox
    M seq/sequel.h

  Log Message:
  -----------
  Cleanup doxygen usage and start drafting 1.6 release notes


  Commit: 47b6cb710278133be258b1cd6bd3c944e7b59a92
      https://github.com/Eyescale/Equalizer/commit/47b6cb710278133be258b1cd6bd3c944e7b59a92
  Author: Stefan Eilemann <Ste...@ep...>
  Date:   2013-05-20 (Mon, 20 May 2013)

  Changed paths:
    M .travis.yml
    M CMake/Common.cmake
    M CMake/CommonCPack.cmake
    M CMake/Compiler.cmake
    M CMake/DoxygenRule.cmake
    A CMake/Doxygit.cmake
    A CMake/FindDisplayCluster.cmake
    A CMake/FindFFMPEG.cmake
    A CMake/FindLibJpegTurbo.cmake
    M CMake/FindMAGELLAN.cmake
    M CMake/FindPackages.cmake
    A CMake/FindPackagesPost.cmake
    A CMake/FindTUIO.cmake
    A CMake/LibFindMacros.cmake
    M CMake/UploadPPA.cmake
    M CMake/configure.cmake
    M CMake/github.cmake
    M CMakeLists.txt
    M GLEW/CMakeLists.txt
    M doc/CMakeLists.txt
    A doc/Doxyfile
    R doc/Doxyfile.Equalizer
    R doc/Doxyfile.Sequel
    R doc/Doxyfile.int
    M doc/README.OpenMP
    M doc/RelNotes.dox
    A doc/RelNotes.md
    M eq/client/CMakeLists.txt
    M eq/client/agl/eventHandler.cpp
    M eq/client/agl/windowSystem.cpp
    M eq/client/channel.cpp
    M eq/client/channel.h
    M eq/client/config.cpp
    R eq/client/configure.cmake
    M eq/client/cudaContext.cpp
    A eq/client/dcProxy.cpp
    A eq/client/dcProxy.h
    M eq/client/detail/channel.ipp
    M eq/client/files.cmake
    M eq/client/glx/eventHandler.cpp
    M eq/client/glx/messagePump.cpp
    M eq/client/glx/windowEvent.h
    M eq/client/observer.cpp
    M eq/client/pipe.cpp
    M eq/client/wgl/eventHandler.cpp
    M eq/client/wgl/windowSystem.cpp
    M eq/fabric/view.h
    M eq/fabric/view.ipp
    M eq/server/CMakeLists.txt
    M eq/server/config/resources.cpp
    M eq/server/loader.l
    M eq/server/loader.y
    M eq/server/server.cpp
    M eq/server/startLocalServer.cpp
    M seq/sequel.h
    M tools/CMakeLists.txt
    M tools/server/eqServer.cpp

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

Conflicts:
	.travis.yml
	CMake/FindPackages.cmake


  Commit: 2ae83b051177990dca2f114824da5ad84e5e3ef9
      https://github.com/Eyescale/Equalizer/commit/2ae83b051177990dca2f114824da5ad84e5e3ef9
  Author: Stefan Eilemann <Ste...@ep...>
  Date:   2013-05-20 (Mon, 20 May 2013)

  Changed paths:
    M .travis.yml
    M CMake/FindPackages.cmake
    M README.rst

  Log Message:
  -----------
  Update dependencies


Compare: https://github.com/Eyescale/Equalizer/compare/f1ee68eca2ae...2ae83b051177