[eq-commit] [Eyescale/Equalizer] c09179: Add MacPorts library dir to plugin and server lib ...

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

  Branch: refs/heads/endian
  Home:   https://github.com/Eyescale/Equalizer
  Commit: c091792140f701a0d8bc243fab50822b48944e61
      https://github.com/Eyescale/Equalizer/commit/c091792140f701a0d8bc243fab50822b48944e61
  Author: Stefan Eilemann <eil...@gm...>
  Date:   2012-09-02 (Sun, 02 Sep 2012)

  Changed paths:
    M libs/co/init.cpp
    M libs/eq/client/client.cpp

  Log Message:
  -----------
  Add MacPorts library dir to plugin and server lib search path

  Commit: 85e3294b27804cb3d45b07a6650b3483964be512
      https://github.com/Eyescale/Equalizer/commit/85e3294b27804cb3d45b07a6650b3483964be512
  Author: Stefan Eilemann <eil...@gm...>
  Date:   2012-09-03 (Mon, 03 Sep 2012)

  Changed paths:
    M examples/eqPly/CMakeLists.txt

  Log Message:
  -----------
  Another MacPorts fix

  Commit: 5ca41b5e4fdee1035f81dd615201ea3cc0dc25f1
      https://github.com/Eyescale/Equalizer/commit/5ca41b5e4fdee1035f81dd615201ea3cc0dc25f1
  Author: Stefan Eilemann <eil...@gm...>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

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

  Log Message:
  -----------
  And another MacPorts fix

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

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

  Log Message:
  -----------
  And another MacPorts fix

  Commit: 7576faa596bb617e33209f026c49ed7e47bb2c1a
      https://github.com/Eyescale/Equalizer/commit/7576faa596bb617e33209f026c49ed7e47bb2c1a
  Author: Stefan Eilemann <eil...@gm...>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M libs/eq/server/loader.y

  Log Message:
  -----------
  Fix yacc warning

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

  Changed paths:
    M CMakeLists.txt
    M examples/CMakeLists.txt
    M examples/eqPly/CMakeLists.txt
    M libs/co/CMakeLists.txt

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

  Commit: 8615c69d53113677868eaba98cfa5ea3a67820d5
      https://github.com/Eyescale/Equalizer/commit/8615c69d53113677868eaba98cfa5ea3a67820d5
  Author: Stefan Eilemann <eil...@gm...>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

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

  Log Message:
  -----------
  And another MacPorts fix

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

  Changed paths:
    M libs/eq/server/loader.y

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

  Commit: 1b117daf6a7d0c68734279467d3c039848327f6a
      https://github.com/Eyescale/Equalizer/commit/1b117daf6a7d0c68734279467d3c039848327f6a
  Author: Stefan Eilemann <eil...@gm...>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M README.rst
    M RELNOTES.txt
    M libs/RelNotes.dox
    M libs/eq/client/image.cpp
    M libs/eq/client/image.h

  Log Message:
  -----------
  Fix #157: Crash in Image::upload when no uploader is found

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

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

  Log Message:
  -----------
  And another MacPorts fix

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

  Changed paths:
    M examples/CMakeLists.txt

  Log Message:
  -----------
  And another MacPorts fix

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

  Changed paths:
    M examples/CMakeLists.txt

  Log Message:
  -----------
  And another MacPorts fix

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

  Changed paths:
    M libs/eq/client/channel.cpp
    M libs/eq/client/detail/channel.ipp

  Log Message:
  -----------
  Revert "Fix https://github.com/Eyescale/Lunchbox/commit/70715b392515d9fed184b44e035e34edb0bd6100#commitcomment-1796718"

This reverts commit 71d2047b3feb91da02aa7cdb7fffb595fc405be0.

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

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

  Log Message:
  -----------
  Implement searching plugins in directories for MacPorts

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

  Changed paths:
    M examples/eqPly/CMakeLists.txt

  Log Message:
  -----------
  And another MacPorts fix

  Commit: c8c8a406005bd7480e9f9823e863446f5950c100
      https://github.com/Eyescale/Equalizer/commit/c8c8a406005bd7480e9f9823e863446f5950c100
  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 examples/CMakeLists.txt
    M examples/eqPly/CMakeLists.txt
    M libs/RelNotes.dox
    M libs/eq/client/client.cpp
    M libs/eq/client/image.cpp
    M libs/eq/client/image.h
    M libs/eq/client/init.cpp

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

Conflicts:
	CMakeLists.txt
	examples/eqPly/CMakeLists.txt
	libs/co/CMakeLists.txt
	libs/co/init.cpp
	libs/co/pluginRegistry.cpp
	libs/eq/server/loader.y

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

  Changed paths:
    M CMakeLists.txt
    M examples/eqPly/CMakeLists.txt

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

  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

  Commit: 9d9ec9cd66f3ce4d07c13ccf825cc9873a3f1067
      https://github.com/Eyescale/Equalizer/commit/9d9ec9cd66f3ce4d07c13ccf825cc9873a3f1067
  Author: Stefan Eilemann <eil...@gm...>
  Date:   2012-09-06 (Thu, 06 Sep 2012)

  Changed paths:
    M CMakeLists.txt
    M README.rst
    M RELNOTES.txt
    M examples/CMakeLists.txt
    M examples/eqPly/CMakeLists.txt
    M libs/RelNotes.dox
    M libs/eq/client/client.cpp
    M libs/eq/client/image.cpp
    M libs/eq/client/image.h
    M libs/eq/client/init.cpp
    M libs/eq/util/pixelBufferObject.cpp
    M libs/eq/util/texture.cpp

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

Conflicts:
	libs/eq/client/channel.cpp

Compare: https://github.com/Eyescale/Equalizer/compare/d43b305cb58e...9d9ec9cd66f3