[eq-commit] [Eyescale/Equalizer] d887de: Merge fixes

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

  Branch: refs/heads/master
  Home:   https://github.com/Eyescale/Equalizer
  Commit: d887de14e3f9a4100594ab8be303b6d59aa4db3d
      https://github.com/Eyescale/Equalizer/commit/d887de14e3f9a4100594ab8be303b6d59aa4db3d
  Author: Stefan Eilemann <eil...@gm...>
  Date:   2012-09-05 (Wed, 05 Sep 2012)

  Changed paths:
    M CMakeLists.txt

  Log Message:
  -----------
  Merge fixes


  Commit: 8a5d90efed81110f3043cd14ac530f730f8e0d7b
      https://github.com/Eyescale/Equalizer/commit/8a5d90efed81110f3043cd14ac530f730f8e0d7b
  Author: Stefan Eilemann <eil...@gm...>
  Date:   2012-09-05 (Wed, 05 Sep 2012)

  Changed paths:
    M CMakeLists.txt

  Log Message:
  -----------
  Prepare 1.4 release


  Commit: 02a17d4f7e6be87cfef36104ca8ec3fc116a2d6e
      https://github.com/Eyescale/Equalizer/commit/02a17d4f7e6be87cfef36104ca8ec3fc116a2d6e
  Author: Stefan Eilemann <eil...@gm...>
  Date:   2012-09-05 (Wed, 05 Sep 2012)

  Changed paths:
    M CMake/Equalizer.spec
    M README.rst
    M RELNOTES.txt
    M libs/RelNotes.dox
    M libs/eq/client/channel.cpp
    M libs/eq/util/pixelBufferObject.cpp
    M libs/eq/util/texture.cpp

  Log Message:
  -----------
  Release and doxygen tweaks


  Commit: f914adac22fc45e2fcd1aeaac74563a1e9778f93
      https://github.com/Eyescale/Equalizer/commit/f914adac22fc45e2fcd1aeaac74563a1e9778f93
  Author: Stefan Eilemann <eil...@gm...>
  Date:   2012-09-05 (Wed, 05 Sep 2012)

  Changed paths:
    M CMakeLists.txt
    M README.rst
    M RELNOTES.txt
    M libs/RelNotes.dox
    M libs/eq/util/pixelBufferObject.cpp
    M libs/eq/util/texture.cpp

  Log Message:
  -----------
  Merge branch '1.4'

Conflicts:
	CMake/Equalizer.spec
	CMakeLists.txt


Compare: https://github.com/Eyescale/Equalizer/compare/099d87b119b6...f914adac22fc