Branch: refs/heads/master
  Home:   https://github.com/Eyescale/Equalizer

  Commit: 3ae39a47374296716679796e5bc5502f2100507c
      
https://github.com/Eyescale/Equalizer/commit/3ae39a47374296716679796e5bc5502f2100507c
  Author: Stefan Eilemann <[email protected]>
  Date:   2011-07-22 (Fri, 22 Jul 2011)

  Changed paths:
    M examples/eVolve/initData.cpp
  M examples/eVolve/initData.h
  M examples/eVolve/localInitData.cpp
  M examples/eVolve/pipe.cpp
  M examples/eqAsync/asyncFetcher.cpp
  M examples/eqPly/initData.cpp
  M examples/eqPly/localInitData.cpp
  M examples/eqPly/pipe.cpp
  M libs/eq/client/agl/aglFactory.cpp
  M libs/eq/client/config.cpp
  M libs/eq/client/files.cmake
  M libs/eq/client/glx/glxFactory.cpp
  M libs/eq/client/node.cpp
  M libs/eq/client/pipe.cpp
  R libs/eq/client/uiFactory.cpp
  R libs/eq/client/uiFactory.h
  M libs/eq/client/wgl/wglFactory.cpp
  M libs/eq/client/window.cpp
  M libs/eq/client/windowSystem.cpp
  M libs/eq/client/windowSystem.h
  M libs/eq/server/config/resources.cpp
  M libs/eq/util/bitmapFont.ipp

  Log Message:
  -----------
  Fix merge conflict

[ ] May break build
[ ] May break existing applications (see CHANGES.txt)
[x] Bugfix
[ ] New Feature
[ ] Cleanup
[ ] Optimization
[ ] Documentation


  Commit: d629bdbb00e0d44e950de5abea51f0a9deaf533f
      
https://github.com/Eyescale/Equalizer/commit/d629bdbb00e0d44e950de5abea51f0a9deaf533f
  Author: Stefan Eilemann <[email protected]>
  Date:   2011-07-22 (Fri, 22 Jul 2011)

  Changed paths:
    M AUTHORS
  M examples/eqAsync/asyncFetcher.cpp
  M libs/eq/client/agl/aglFactory.cpp
  M libs/eq/client/glx/glxFactory.cpp
  M libs/eq/client/node.cpp
  M libs/eq/client/pipe.cpp
  M libs/eq/client/pipe.h
  M libs/eq/client/wgl/wglFactory.cpp
  M libs/eq/client/window.cpp
  M libs/eq/client/windowSystem.cpp
  M libs/eq/client/windowSystem.h
  M libs/eq/util/bitmapFont.ipp

  Log Message:
  -----------
  Cleanups on last merge

[ ] May break build
[ ] May break existing applications (see CHANGES.txt)
[ ] Bugfix
[ ] New Feature
[x] Cleanup
[ ] Optimization
[ ] Documentation


  Commit: 7b8f7a4cbffcd2df254f71c6292c63414f3214f7
      
https://github.com/Eyescale/Equalizer/commit/7b8f7a4cbffcd2df254f71c6292c63414f3214f7
  Author: Stefan Eilemann <[email protected]>
  Date:   2011-07-22 (Fri, 22 Jul 2011)

  Changed paths:
    M examples/eqAsync/asyncFetcher.cpp
  M libs/eq/client/agl/aglFactory.cpp
  M libs/eq/client/config.cpp
  M libs/eq/client/glx/glxFactory.cpp
  M libs/eq/client/wgl/wglFactory.cpp
  M libs/eq/client/windowSystem.cpp
  M libs/eq/client/windowSystem.h
  M libs/eq/util/bitmapFont.ipp

  Log Message:
  -----------
  Partial source compatibility for new WindowSystem impl. More to follow.

[ ] May break build
[ ] May break existing applications (see CHANGES.txt)
[ ] Bugfix
[ ] New Feature
[x] Cleanup
[ ] Optimization
[ ] Documentation


  Commit: 5e6f563ee8148821197c67231eb05a428a1638b6
      
https://github.com/Eyescale/Equalizer/commit/5e6f563ee8148821197c67231eb05a428a1638b6
  Author: Stefan Eilemann <[email protected]>
  Date:   2011-07-22 (Fri, 22 Jul 2011)

  Changed paths:
    M libs/eq/client/windowSystem.cpp
  M libs/eq/client/windowSystem.h

  Log Message:
  -----------
  Partial source compatibility for new WindowSystem impl part 2

[ ] May break build
[ ] May break existing applications (see CHANGES.txt)
[ ] Bugfix
[ ] New Feature
[x] Cleanup
[ ] Optimization
[ ] Documentation


  Commit: a93df93e8f544d203349a6ae5f1cf4ff09adfd91
      
https://github.com/Eyescale/Equalizer/commit/a93df93e8f544d203349a6ae5f1cf4ff09adfd91
  Author: Stefan Eilemann <[email protected]>
  Date:   2011-07-22 (Fri, 22 Jul 2011)

  Changed paths:
    A doc/README.IB

  Log Message:
  -----------
  Infiniband readme notes.

[ ] May break build
[ ] May break existing applications (see CHANGES.txt)
[ ] Bugfix
[ ] New Feature
[ ] Cleanup
[ ] Optimization
[x] Documentation


Compare: https://github.com/Eyescale/Equalizer/compare/6b3514f...a93df93

------------------------------------------------------------------------------
10 Tips for Better Web Security
Learn 10 ways to better secure your business today. Topics covered include:
Web security, SSL, hacker attacks & Denial of Service (DoS), private keys,
security Microsoft Exchange, secure Instant Messaging, and much more.
http://www.accelacomm.com/jaw/sfnl/114/51426210/
_______________________________________________
Equalizer-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/equalizer-commit
http://www.equalizergraphics.com

Reply via email to