[eq-commit] [Eyescale/Equalizer] ff026f: Fix assert regression introduced with #194

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

  Branch: refs/heads/customHMD
  Home:   https://github.com/Eyescale/Equalizer
  Commit: ff026ff795a91afbfd16a667ac495a018ea4a6f4
      https://github.com/Eyescale/Equalizer/commit/ff026ff795a91afbfd16a667ac495a018ea4a6f4
  Author: Stefan Eilemann <Ste...@ep...>
  Date:   2013-01-18 (Fri, 18 Jan 2013)

  Changed paths:
    M eq/fabric/segment.ipp

  Log Message:
  -----------
  Fix assert regression introduced with #194


  Commit: 769c60f1b7c96797637f753e1e06bb959fe6481d
      https://github.com/Eyescale/Equalizer/commit/769c60f1b7c96797637f753e1e06bb959fe6481d
  Author: Daniel Nachbaur <dan...@ep...>
  Date:   2013-01-18 (Fri, 18 Jan 2013)

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

  Log Message:
  -----------
  Add missing --eq-modelunit documentation


  Commit: 6ecb9d2da04a16c6abb0dcd7fe2b3dee46e9d4b8
      https://github.com/Eyescale/Equalizer/commit/6ecb9d2da04a16c6abb0dcd7fe2b3dee46e9d4b8
  Author: Daniel Nachbaur <dan...@ep...>
  Date:   2013-01-18 (Fri, 18 Jan 2013)

  Changed paths:
    M eq/server/startLocalServer.cpp

  Log Message:
  -----------
  Fix execution with session name length < 4


  Commit: 7cedf3238a8d4f9b84d45e24a25a722fbb532f38
      https://github.com/Eyescale/Equalizer/commit/7cedf3238a8d4f9b84d45e24a25a722fbb532f38
  Author: Stefan Eilemann <Ste...@ep...>
  Date:   2013-01-18 (Fri, 18 Jan 2013)

  Changed paths:
    M eq/client/agl/eventHandler.cpp

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


  Commit: 3d39bda72e74c74fe1820309a117118b99659c0d
      https://github.com/Eyescale/Equalizer/commit/3d39bda72e74c74fe1820309a117118b99659c0d
  Author: Stefan Eilemann <Ste...@ep...>
  Date:   2013-01-18 (Fri, 18 Jan 2013)

  Changed paths:
    M eq/fabric/configure.cmake
    M eq/fabric/eye.h
    M eq/fabric/observer.h
    M eq/fabric/observer.ipp
    M eq/server/compound.cpp
    M eq/server/loader.l
    M eq/server/loader.y
    M eq/server/observer.cpp
    M eq/server/observer.h
    M eq/server/view.cpp
    M examples/eqPly/config.cpp

  Log Message:
  -----------
  Closes #196: asymmetric eye position


  Commit: da2b9bb64f42c1b08f784e314ad6abf2db97c4b0
      https://github.com/Eyescale/Equalizer/commit/da2b9bb64f42c1b08f784e314ad6abf2db97c4b0
  Author: Stefan Eilemann <Ste...@ep...>
  Date:   2013-01-18 (Fri, 18 Jan 2013)

  Changed paths:
    M eq/client/client.h
    M eq/client/init.cpp
    M eq/server/startLocalServer.cpp

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


  Commit: f13a69eae634efff3100a9fa4f153283f666863d
      https://github.com/Eyescale/Equalizer/commit/f13a69eae634efff3100a9fa4f153283f666863d
  Author: Stefan Eilemann <Ste...@ep...>
  Date:   2013-01-20 (Sun, 20 Jan 2013)

  Changed paths:
    M eq/server/compound.cpp

  Log Message:
  -----------
  Cosmetics


  Commit: 418de50acf2d91bb8ce2749fea29b887d4898763
      https://github.com/Eyescale/Equalizer/commit/418de50acf2d91bb8ce2749fea29b887d4898763
  Author: Stefan Eilemann <Ste...@ep...>
  Date:   2013-01-20 (Sun, 20 Jan 2013)

  Changed paths:
    M eq/client/agl/eventHandler.cpp
    M eq/client/client.h
    M eq/client/init.cpp
    M eq/fabric/configure.cmake
    M eq/fabric/eye.h
    M eq/fabric/observer.h
    M eq/fabric/observer.ipp
    M eq/fabric/segment.ipp
    M eq/server/compound.cpp
    M eq/server/loader.l
    M eq/server/loader.y
    M eq/server/observer.cpp
    M eq/server/observer.h
    M eq/server/startLocalServer.cpp
    M eq/server/view.cpp
    M examples/eqPly/config.cpp

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

Conflicts:
	eq/fabric/observer.h
	eq/server/compound.cpp


  Commit: c419aaa06c8fd33e8c8bd6a0f79808fa31412c69
      https://github.com/Eyescale/Equalizer/commit/c419aaa06c8fd33e8c8bd6a0f79808fa31412c69
  Author: Stefan Eilemann <Ste...@ep...>
  Date:   2013-01-20 (Sun, 20 Jan 2013)

  Changed paths:
    M eq/server/compound.cpp

  Log Message:
  -----------
  Fix missing model unit transform for non-tracked eyes (#196)


  Commit: 04c5448146bd05d32d4be5a802e0f2f460c3d934
      https://github.com/Eyescale/Equalizer/commit/04c5448146bd05d32d4be5a802e0f2f460c3d934
  Author: Stefan Eilemann <Ste...@ep...>
  Date:   2013-01-20 (Sun, 20 Jan 2013)

  Changed paths:
    M eq/server/compound.cpp

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


  Commit: 7ef89cc7dcfe2e3d44401634261031c481729338
      https://github.com/Eyescale/Equalizer/commit/7ef89cc7dcfe2e3d44401634261031c481729338
  Author: Stefan Eilemann <Ste...@ep...>
  Date:   2013-01-20 (Sun, 20 Jan 2013)

  Changed paths:
    M eq/fabric/observer.ipp
    M eq/fabric/types.h

  Log Message:
  -----------
  Partial build fix


Compare: https://github.com/Eyescale/Equalizer/compare/0759de0fd1d9...7ef89cc7dcfe