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

  Commit: ba9403708aefcda248cf220bc02dd3b4f5538b26
      
https://github.com/Eyescale/Equalizer/commit/ba9403708aefcda248cf220bc02dd3b4f5538b26
  Author: Daniel Nachbaur <[email protected]>
  Date:   2011-08-22 (Mon, 22 Aug 2011)

  Changed paths:
    M examples/eqPly/channel.cpp
  M examples/eqPly/config.cpp
  M examples/eqPly/frameData.cpp
  M examples/eqPly/frameData.h
  M libs/co/plugins/compressorTypes.h
  M libs/eq/client/channel.cpp
  M libs/eq/client/frame.cpp
  M libs/eq/client/frame.h
  M libs/eq/client/frameData.cpp
  M libs/eq/client/frameData.h
  M libs/eq/client/image.cpp
  M libs/eq/client/image.h

  Log Message:
  -----------
  Fix cherry-pick conflicts

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


  Commit: 61516a94da8f934e58fd4e2d93794712ed3e731e
      
https://github.com/Eyescale/Equalizer/commit/61516a94da8f934e58fd4e2d93794712ed3e731e
  Author: Daniel Nachbaur <[email protected]>
  Date:   2011-08-22 (Mon, 22 Aug 2011)

  Changed paths:
    M libs/eq/client/frameData.cpp
  M libs/eq/client/image.cpp
  M libs/eq/client/pixelData.cpp

  Log Message:
  -----------
  Fix cherry-pick conflicts

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


  Commit: 8770f25d95aa3b77ac6ea807a06ef454f1401f9e
      
https://github.com/Eyescale/Equalizer/commit/8770f25d95aa3b77ac6ea807a06ef454f1401f9e
  Author: Daniel Nachbaur <[email protected]>
  Date:   2011-08-22 (Mon, 22 Aug 2011)

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

  Log Message:
  -----------
  #31: Fixed compressor selection for custom readbacks

[ ] May break build
[ ] Breaks existing applications
[x] Bugfix
[ ] New Feature
[ ] Cleanup
[ ] Optimization
[ ] Documentation


  Commit: 8e371503977cd0a66844e2bb19b1e15bbef178f3
      
https://github.com/Eyescale/Equalizer/commit/8e371503977cd0a66844e2bb19b1e15bbef178f3
  Author: Stefan Eilemann <[email protected]>
  Date:   2011-08-22 (Mon, 22 Aug 2011)

  Changed paths:
    M examples/eqPly/channel.cpp
  M examples/eqPly/config.cpp
  M examples/eqPly/eqPly.cpp
  M examples/eqPly/frameData.cpp
  M examples/eqPly/frameData.h
  M libs/eq/client/frame.h
  M libs/eq/client/frameData.cpp
  M libs/eq/client/frameData.h
  M libs/eq/client/image.h

  Log Message:
  -----------
  Cleanups on last cherry-pick

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


  Commit: b3fc08db5b79fa25840cbab40896ca1b630bf918
      
https://github.com/Eyescale/Equalizer/commit/b3fc08db5b79fa25840cbab40896ca1b630bf918
  Author: Daniel Nachbaur <[email protected]>
  Date:   2011-08-23 (Tue, 23 Aug 2011)

  Changed paths:
    M libs/co/plugins/compressorTypes.h

  Log Message:
  -----------
  #31: Don't break binary compatibility

[ ] May break build
[ ] Breaks existing applications
[x] Bugfix
[ ] New Feature
[ ] Cleanup
[ ] Optimization
[ ] Documentation


  Commit: 668e831c5a444cbb0db0d8fed455aa014133192a
      
https://github.com/Eyescale/Equalizer/commit/668e831c5a444cbb0db0d8fed455aa014133192a
  Author: Daniel Nachbaur <[email protected]>
  Date:   2011-08-23 (Tue, 23 Aug 2011)

  Changed paths:
    M libs/co/plugins/compressorTypes.h
  M libs/eq/client/channel.cpp

  Log Message:
  -----------
  Fix cherry-pick merge conflicts

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


Compare: https://github.com/Eyescale/Equalizer/compare/f81f336...668e831

------------------------------------------------------------------------------
Get a FREE DOWNLOAD! and learn more about uberSVN rich system, 
user administration capabilities and model configuration. Take 
the hassle out of deploying and managing Subversion and the 
tools developers use with it. http://p.sf.net/sfu/wandisco-d2d-2
_______________________________________________
Equalizer-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/equalizer-commit
http://www.equalizergraphics.com

Reply via email to