Branch: refs/heads/benchmark
  Home:   https://github.com/Eyescale/Equalizer
  Commit: fa31d2e2feea3c43d7671cf20191190bcf66924a
      
https://github.com/Eyescale/Equalizer/commit/fa31d2e2feea3c43d7671cf20191190bcf66924a
  Author: Stefan Eilemann <[email protected]>
  Date:   2012-01-13 (Fri, 13 Jan 2012)

  Changed paths:
    M examples/eqPly/eqPly.cpp
  M libs/eq/server/config/server.cpp
  A testScripts/common.py
  A testScripts/convertTestResultsToCSV.py
  A testScripts/plotResults.py
  A testScripts/runTests.py
  A testScripts/startServers.py

  Log Message:
  -----------
  Merge branch 'benchmark' of https://github.com/bilgili/Equalizer into 
benchmark

Conflicts:
        libs/eq/server/config/server.cpp


  Commit: 5d4989920e23811044e00f936d44322b29188d0c
      
https://github.com/Eyescale/Equalizer/commit/5d4989920e23811044e00f936d44322b29188d0c
  Author: Stefan Eilemann <[email protected]>
  Date:   2012-01-13 (Fri, 13 Jan 2012)

  Changed paths:
    M libs/eq/server/types.h

  Log Message:
  -----------
  Minor cleanup

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


  Commit: 946c5bd131a396cfffddf5d968d52368e47c2cfb
      
https://github.com/Eyescale/Equalizer/commit/946c5bd131a396cfffddf5d968d52368e47c2cfb
  Author: Stefan Eilemann <[email protected]>
  Date:   2012-01-13 (Fri, 13 Jan 2012)

  Changed paths:
    M libs/eq/server/types.h

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


  Commit: ffa2f669d8501e46ef5643753df43d85c4d5ef8a
      
https://github.com/Eyescale/Equalizer/commit/ffa2f669d8501e46ef5643753df43d85c4d5ef8a
  Author: Stefan Eilemann <[email protected]>
  Date:   2012-01-13 (Fri, 13 Jan 2012)

  Changed paths:
    M libs/eq/server/types.h

  Log Message:
  -----------
  Minor cleanup

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


  Commit: 20be1a59a473882a7a0d5c9cb01202751ffc62a9
      
https://github.com/Eyescale/Equalizer/commit/20be1a59a473882a7a0d5c9cb01202751ffc62a9
  Author: Stefan Eilemann <[email protected]>
  Date:   2012-01-13 (Fri, 13 Jan 2012)

  Changed paths:
    M libs/eq/server/types.h

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


  Commit: effc6d5fc58cfc21facb44f9442641d747d3d851
      
https://github.com/Eyescale/Equalizer/commit/effc6d5fc58cfc21facb44f9442641d747d3d851
  Author: Stefan Eilemann <[email protected]>
  Date:   2012-01-13 (Fri, 13 Jan 2012)

  Changed paths:
    M examples/eqPly/channel.cpp
  M examples/eqPly/eqPly.cpp
  M examples/eqPly/eqPly.h
  M libs/eq/server/config/server.cpp
  R testScripts/common.py
  R testScripts/convertTestResultsToCSV.py
  R testScripts/plotResults.py
  R testScripts/runTests.py
  R testScripts/startServers.py
  A tools/benchmark/common.py
  A tools/benchmark/convertTestResultsToCSV.py
  A tools/benchmark/plotResults.py
  A tools/benchmark/runTests.py
  A tools/benchmark/startServers.py

  Log Message:
  -----------
  Merge cleanups

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


Compare: https://github.com/Eyescale/Equalizer/compare/d3a51ad...effc6d5
------------------------------------------------------------------------------
RSA(R) Conference 2012
Mar 27 - Feb 2
Save $400 by Jan. 27
Register now!
http://p.sf.net/sfu/rsa-sfdev2dev2
_______________________________________________
Equalizer-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/equalizer-commit
http://www.equalizergraphics.com

Reply via email to