Branch: refs/heads/master
  Home:   https://github.com/Eyescale/Equalizer
  Commit: 1dc5b62a65df2e8c8ecdc369fde81fff926caf44
      
https://github.com/Eyescale/Equalizer/commit/1dc5b62a65df2e8c8ecdc369fde81fff926caf44
  Author: Stefan Eilemann <[email protected]>
  Date:   2012-01-09 (Mon, 09 Jan 2012)

  Changed paths:
    M CMakeLists.txt
  M commitMessage.txt
  M libs/co/CMakeLists.txt
  M libs/co/base/thread.cpp
  M libs/co/base/thread.h
  M libs/co/configure.cmake
  M libs/eq/client/pipe.cpp
  M libs/eq/fabric/iAttribute.h
  M libs/eq/server/loader.l
  M libs/eq/server/loader.y

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/marwan-abdellah/Equalizer

Conflicts:
        commitMessage.txt


  Commit: 4f1782335b796ca321a7b55e61d8b8aeaa653921
      
https://github.com/Eyescale/Equalizer/commit/4f1782335b796ca321a7b55e61d8b8aeaa653921
  Author: Stefan Eilemann <[email protected]>
  Date:   2012-01-09 (Mon, 09 Jan 2012)

  Changed paths:
    M CMakeLists.txt
  M libs/co/CMakeLists.txt
  M libs/co/base/thread.cpp
  M libs/co/base/thread.h
  M libs/eq/client/pipe.cpp
  M libs/eq/client/pipe.h
  M libs/eq/server/loader.y

  Log Message:
  -----------
  Code review on cpu affinity merge

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


Compare: https://github.com/Eyescale/Equalizer/compare/42b0ba1...4f17823
------------------------------------------------------------------------------
Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex
infrastructure or vast IT resources to deliver seamless, secure access to
virtual desktops. With this all-in-one solution, easily deploy virtual 
desktops for less than the cost of PCs and save 60% on VDI infrastructure 
costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox
_______________________________________________
Equalizer-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/equalizer-commit
http://www.equalizergraphics.com

Reply via email to