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

Commit: ee5afe8d1d47c18274d71cfc4c4d3c8015aa6e27
    
https://github.com/Eyescale/Equalizer/commit/ee5afe8d1d47c18274d71cfc4c4d3c8015aa6e27
Author: delyas <[email protected]>
Date:   2011-06-09 (Thu, 09 Jun 2011)

Changed paths:
  M libs/collage/commands.h
  M libs/collage/files.cmake
  M libs/collage/global.cpp
  M libs/collage/global.h
  M libs/collage/packets.h
  A libs/collage/queueMaster.cpp
  A libs/collage/queueMaster.h
  A libs/collage/queueSlave.cpp
  A libs/collage/queueSlave.h
  M libs/fabric/files.cmake

Log Message:
-----------
tile queues

now available

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


Commit: 76280e4255c7fd9aef3ad9af228d43320703809e
    
https://github.com/Eyescale/Equalizer/commit/76280e4255c7fd9aef3ad9af228d43320703809e
Author: delyas <[email protected]>
Date:   2011-06-10 (Fri, 10 Jun 2011)

Changed paths:
  M libs/collage/commands.h
  M libs/collage/files.cmake
  M libs/collage/global.cpp
  M libs/collage/global.h
  M libs/collage/packets.h
  A libs/collage/queueMaster.cpp
  A libs/collage/queueMaster.h
  A libs/collage/queueSlave.cpp
  A libs/collage/queueSlave.h
  M libs/fabric/files.cmake
  A libs/fabric/queuePackets.h

Log Message:
-----------
tile queues

now available

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


Commit: 0b512e809df1d3a42e005a23139dd24d5d36b427
    
https://github.com/Eyescale/Equalizer/commit/0b512e809df1d3a42e005a23139dd24d5d36b427
Author: delyas <[email protected]>
Date:   2011-06-10 (Fri, 10 Jun 2011)

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


Commit: bb456b604b9dde7077d274f24d44372e5835f842
    
https://github.com/Eyescale/Equalizer/commit/bb456b604b9dde7077d274f24d44372e5835f842
Author: delyas <[email protected]>
Date:   2011-06-10 (Fri, 10 Jun 2011)

Changed paths:
  M libs/collage/queueMaster.h

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


Commit: 7b5a7e315cecea641c8b2ea81977d3a483595da5
    
https://github.com/Eyescale/Equalizer/commit/7b5a7e315cecea641c8b2ea81977d3a483595da5
Author: delyas <[email protected]>
Date:   2011-06-10 (Fri, 10 Jun 2011)

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


Commit: 463254764f1b8d62ee4a392267e3bdb766799e57
    
https://github.com/Eyescale/Equalizer/commit/463254764f1b8d62ee4a392267e3bdb766799e57
Author: delyas <[email protected]>
Date:   2011-06-10 (Fri, 10 Jun 2011)

Changed paths:
  M libs/collage/global.cpp
  M libs/collage/queueMaster.cpp
  M libs/collage/queueSlave.cpp
  M libs/collage/queueSlave.h

Log Message:
-----------
optimized tile queue
fixed linux build

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


Commit: 7756c97484c7e83228a6f3587b9c3bbdc34b244f
    
https://github.com/Eyescale/Equalizer/commit/7756c97484c7e83228a6f3587b9c3bbdc34b244f
Author: delyas <[email protected]>
Date:   2011-06-10 (Fri, 10 Jun 2011)

Changed paths:
  M libs/collage/global.cpp
  M libs/collage/queueMaster.cpp
  M libs/collage/queueMaster.h
  M libs/collage/queueSlave.cpp
  M libs/collage/queueSlave.h

Log Message:
-----------
optimized tile queue
fixed linux build

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


Commit: 135d35fe3f6fc93add52af0423aec0c4b4f1cb14
    
https://github.com/Eyescale/Equalizer/commit/135d35fe3f6fc93add52af0423aec0c4b4f1cb14
Author: delyas <[email protected]>
Date:   2011-06-10 (Fri, 10 Jun 2011)

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

Conflicts:
        libs/collage/queueSlave.cpp

lessons learned: never amend commit after push


Commit: a23ecb6500dec831be8933c375b4fb2a9965dc29
    
https://github.com/Eyescale/Equalizer/commit/a23ecb6500dec831be8933c375b4fb2a9965dc29
Author: Stefan Eilemann <[email protected]>
Date:   2011-06-10 (Fri, 10 Jun 2011)

Changed paths:
  A examples/configs/2-node.tiles.eqc
  M libs/collage/commands.h
  M libs/collage/connectionSet.cpp
  M libs/collage/files.cmake
  M libs/collage/global.cpp
  M libs/collage/global.h
  M libs/collage/packets.h
  A libs/collage/queueMaster.cpp
  A libs/collage/queueMaster.h
  A libs/collage/queueSlave.cpp
  A libs/collage/queueSlave.h
  M libs/fabric/files.cmake
  A libs/fabric/queuePackets.h
  M libs/server/CMakeLists.txt
  M libs/server/compound.cpp
  M libs/server/compound.h
  M libs/server/loader.l
  M libs/server/loader.y
  A libs/server/tileQueue.cpp
  A libs/server/tileQueue.h
  M libs/server/types.h
  M tests/loader/examples.cpp

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


Commit: afd9bc7bbbe0b5a81fbcc6141c5661a1ebbeaff9
    
https://github.com/Eyescale/Equalizer/commit/afd9bc7bbbe0b5a81fbcc6141c5661a1ebbeaff9
Author: Stefan Eilemann <[email protected]>
Date:   2011-06-10 (Fri, 10 Jun 2011)

Changed paths:
  M libs/collage/commands.h
  M libs/collage/connectionSet.cpp
  M libs/collage/files.cmake
  M libs/collage/packets.h
  M libs/collage/queueMaster.cpp
  M libs/collage/queueMaster.h
  M libs/collage/queueSlave.cpp
  M libs/collage/queueSlave.h
  M libs/fabric/files.cmake
  M libs/fabric/queuePackets.h
  M libs/server/compound.h
  M libs/server/loader.l
  M libs/server/loader.y
  M libs/server/tileQueue.cpp
  M libs/server/tileQueue.h
  M libs/server/types.h

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

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


Compare: https://github.com/Eyescale/Equalizer/compare/b9efdcd...afd9bc7

------------------------------------------------------------------------------
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
_______________________________________________
Equalizer-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/equalizer-commit
http://www.equalizergraphics.com

Reply via email to