Branch: refs/heads/master
  Home:   https://github.com/Eyescale/Equalizer
  Commit: b2a92d491bb4778fbc4786c2f1ab814331952629
      
https://github.com/Eyescale/Equalizer/commit/b2a92d491bb4778fbc4786c2f1ab814331952629
  Author: Daniel Nachbaur <[email protected]>
  Date:   2014-02-20 (Thu, 20 Feb 2014)

  Changed paths:
    M eq/client/channel.cpp
    M eq/client/eventHandler.cpp
    M eq/client/eventHandler.h
    M eq/client/files.cmake
    M eq/client/glWindow.cpp
    M eq/client/glWindow.h
    M eq/client/glx/eventHandler.cpp
    M eq/client/glx/eventHandler.h
    M eq/client/glx/types.h
    M eq/client/glx/window.cpp
    M eq/client/glx/window.h
    M eq/client/glx/windowSystem.cpp
    A eq/client/notifierInterface.h
    M eq/client/systemWindow.cpp
    M eq/client/systemWindow.h
    M eq/client/types.h
    M eq/client/window.cpp
    M eq/client/window.h
    M eq/client/windowStatistics.cpp
    M eq/client/windowSystem.cpp
    M eq/client/windowSystem.h
    M eq/fabric/files.cmake
    M eq/fabric/iAttribute.h
    M eq/fabric/types.h
    M eq/fabric/window.h
    M eq/fabric/window.ipp
    A eq/fabric/windowSettings.cpp
    A eq/fabric/windowSettings.h
    M eq/server/compound.cpp
    M eq/server/config/display.cpp
    M eq/server/config/resources.cpp
    M eq/server/global.cpp
    M eq/server/global.h
    M eq/server/loader.y
    M eq/server/types.h
    M eq/server/window.cpp
    M examples/eVolve/window.cpp
    M examples/eqAsync/asyncFetcher.cpp
    M examples/eqPixelBench/window.cpp
    M examples/eqPly/window.cpp
    M tools/configTool/configTool.cpp

  Log Message:
  -----------
  Fix #69: Introduce WindowSettings to decouple Window from SystemWindow

This also fixes a possible race while creating new system windows from
different threads as they modify the parent eq::Window directly.


  Commit: 3636b18cd691c9c8c914809359e52e22449aff66
      
https://github.com/Eyescale/Equalizer/commit/3636b18cd691c9c8c914809359e52e22449aff66
  Author: Stefan Eilemann <[email protected]>
  Date:   2014-02-21 (Fri, 21 Feb 2014)

  Changed paths:
    M eq/client/channel.cpp
    M eq/client/eventHandler.cpp
    M eq/client/eventHandler.h
    M eq/client/files.cmake
    M eq/client/glWindow.cpp
    M eq/client/glWindow.h
    M eq/client/glx/eventHandler.cpp
    M eq/client/glx/eventHandler.h
    M eq/client/glx/types.h
    M eq/client/glx/window.cpp
    M eq/client/glx/window.h
    M eq/client/glx/windowSystem.cpp
    A eq/client/notifierInterface.h
    M eq/client/systemWindow.cpp
    M eq/client/systemWindow.h
    M eq/client/types.h
    M eq/client/window.cpp
    M eq/client/window.h
    M eq/client/windowStatistics.cpp
    M eq/client/windowSystem.cpp
    M eq/client/windowSystem.h
    M eq/fabric/files.cmake
    M eq/fabric/iAttribute.h
    M eq/fabric/types.h
    M eq/fabric/window.h
    M eq/fabric/window.ipp
    A eq/fabric/windowSettings.cpp
    A eq/fabric/windowSettings.h
    M eq/server/compound.cpp
    M eq/server/compound.h
    M eq/server/config/display.cpp
    M eq/server/config/resources.cpp
    M eq/server/global.cpp
    M eq/server/global.h
    M eq/server/loader.y
    M eq/server/types.h
    M eq/server/window.cpp
    M examples/eVolve/window.cpp
    M examples/eqAsync/asyncFetcher.cpp
    M examples/eqPixelBench/window.cpp
    M examples/eqPly/window.cpp
    M tools/configTool/configTool.cpp

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


  Commit: aa93fa8cc178537cbc14673bcd659c4b65430508
      
https://github.com/Eyescale/Equalizer/commit/aa93fa8cc178537cbc14673bcd659c4b65430508
  Author: Stefan Eilemann <[email protected]>
  Date:   2014-02-25 (Tue, 25 Feb 2014)

  Changed paths:
    M tools/CMakeLists.txt
    R tools/configTool/configTool.cpp
    R tools/configTool/configTool.h
    R tools/configTool/frame.h
    R tools/configTool/writeFromFile.cpp

  Log Message:
  -----------
  Remove old configTool


  Commit: 39cc4996052b4263926d05ad44ecf9179ddd88bf
      
https://github.com/Eyescale/Equalizer/commit/39cc4996052b4263926d05ad44ecf9179ddd88bf
  Author: Stefan Eilemann <[email protected]>
  Date:   2014-02-25 (Tue, 25 Feb 2014)

  Changed paths:
    M CHANGES.md
    M CMakeLists.txt
    M eq/client/eventHandler.cpp
    M eq/client/eventHandler.h
    M eq/client/glWindow.h
    M eq/client/glx/eventHandler.cpp
    M eq/client/glx/eventHandler.h
    M eq/client/glx/window.cpp
    M eq/client/glx/window.h
    M eq/client/notifierInterface.h
    M eq/client/systemWindow.cpp
    M eq/client/systemWindow.h
    M eq/client/window.cpp
    M eq/client/window.h
    M eq/fabric/iAttribute.h
    M eq/fabric/object.h
    M eq/fabric/window.h
    M eq/fabric/window.ipp
    M eq/fabric/windowSettings.cpp
    M eq/fabric/windowSettings.h

  Log Message:
  -----------
  CR #301


  Commit: 0555fab0d5b4cd6c0ca5045f079f0fb389213cd8
      
https://github.com/Eyescale/Equalizer/commit/0555fab0d5b4cd6c0ca5045f079f0fb389213cd8
  Author: Daniel Nachbaur <[email protected]>
  Date:   2014-02-27 (Thu, 27 Feb 2014)

  Changed paths:
    M CHANGES.md
    M CMake/Equalizer.spec
    M eq/client/agl/window.cpp
    M eq/client/agl/window.h
    M eq/client/agl/windowSystem.cpp
    M eq/client/channel.cpp
    M eq/client/channel.h
    M eq/client/dc/eventHandler.cpp
    M eq/client/detail/channel.ipp
    M eq/client/detail/statsRenderer.h
    M eq/client/files.cmake
    M eq/client/glWindow.cpp
    M eq/client/glWindow.h
    M eq/client/glx/eventHandler.cpp
    M eq/client/glx/eventHandler.h
    M eq/client/glx/window.cpp
    M eq/client/glx/window.h
    M eq/client/glx/windowSystem.cpp
    M eq/client/notifierInterface.h
    M eq/client/systemWindow.cpp
    M eq/client/systemWindow.h
    M eq/client/types.h
    M eq/client/wgl/window.cpp
    M eq/client/wgl/window.h
    M eq/client/wgl/windowSystem.cpp
    M eq/client/window.cpp
    M eq/client/window.h
    A eq/client/windowSettings.cpp
    A eq/client/windowSettings.h
    M eq/client/windowSystem.h
    M eq/fabric/channel.h
    M eq/fabric/pipe.h
    M eq/fabric/types.h
    M eq/fabric/window.h
    M eq/fabric/window.ipp
    M eq/fabric/windowSettings.cpp
    M eq/fabric/windowSettings.h
    M eq/server/node.cpp
    M eq/server/window.cpp
    M examples/osgScaleViewer/window.cpp

  Log Message:
  -----------
  Fixes after CR #301


  Commit: 5bff338e8deb0cf91cc428123e0a6d96b76847b6
      
https://github.com/Eyescale/Equalizer/commit/5bff338e8deb0cf91cc428123e0a6d96b76847b6
  Author: Daniel Nachbaur <[email protected]>
  Date:   2014-02-27 (Thu, 27 Feb 2014)

  Changed paths:
    M eq/admin/server.cpp
    M eq/client/frameData.cpp
    M eq/client/types.h
    M eq/server/config/display.cpp

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

Conflicts:
        eq/server/config/display.cpp


  Commit: 44942f0fe4f252acfac0f8d4c32726c2b9877247
      
https://github.com/Eyescale/Equalizer/commit/44942f0fe4f252acfac0f8d4c32726c2b9877247
  Author: Stefan Eilemann <[email protected]>
  Date:   2014-02-27 (Thu, 27 Feb 2014)

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


  Commit: b7ec81f7b5f741c878b9f5e7cab501a77117f6d4
      
https://github.com/Eyescale/Equalizer/commit/b7ec81f7b5f741c878b9f5e7cab501a77117f6d4
  Author: Stefan Eilemann <[email protected]>
  Date:   2014-02-27 (Thu, 27 Feb 2014)

  Changed paths:
    M CHANGES.md
    M eq/client/agl/eventHandler.cpp
    M eq/client/window.cpp
    M eq/client/windowSettings.h

  Log Message:
  -----------
  CR


  Commit: 33200dd47d8d663bb45c6e6fa8672b012837f47c
      
https://github.com/Eyescale/Equalizer/commit/33200dd47d8d663bb45c6e6fa8672b012837f47c
  Author: Daniel Nachbaur <[email protected]>
  Date:   2014-03-01 (Sat, 01 Mar 2014)

  Changed paths:
    M eq/client/wgl/eventHandler.cpp
    M eq/client/wgl/window.cpp
    M eq/client/wgl/window.h
    M eq/client/wgl/windowSystem.cpp
    M eq/client/windowSettings.cpp
    M eq/client/windowSettings.h
    M eq/fabric/windowSettings.cpp
    M eq/fabric/windowSettings.h

  Log Message:
  -----------
  Fix Win32 build


  Commit: ce096d3941a79caec03b28f1aedd0f5a39665277
      
https://github.com/Eyescale/Equalizer/commit/ce096d3941a79caec03b28f1aedd0f5a39665277
  Author: Stefan Eilemann <[email protected]>
  Date:   2014-03-02 (Sun, 02 Mar 2014)

  Changed paths:
    M eq/client/agl/eventHandler.cpp
    M eq/client/agl/window.cpp
    M eq/client/agl/window.h
    M eq/client/agl/windowSystem.cpp
    M eq/client/glx/windowSystem.cpp
    M eq/client/window.cpp

  Log Message:
  -----------
  Partial OS X windowsettings impl


  Commit: 36ad731650050c85345d761cd4fecdc39534d68d
      
https://github.com/Eyescale/Equalizer/commit/36ad731650050c85345d761cd4fecdc39534d68d
  Author: Daniel Nachbaur <[email protected]>
  Date:   2014-03-06 (Thu, 06 Mar 2014)

  Changed paths:
    M eq/client/agl/eventHandler.cpp
    M eq/client/agl/windowSystem.cpp

  Log Message:
  -----------
  Fix non-magellan build


  Commit: 73033d13dae99595037e2ff6fdae827acfb3d6e5
      
https://github.com/Eyescale/Equalizer/commit/73033d13dae99595037e2ff6fdae827acfb3d6e5
  Author: Stefan Eilemann <[email protected]>
  Date:   2014-03-07 (Fri, 07 Mar 2014)

  Changed paths:
    M eq/client/agl/eventHandler.cpp
    M eq/client/agl/windowSystem.cpp

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

Conflicts:
        eq/client/agl/windowSystem.cpp
        eq/server/config/display.cpp


Compare: 
https://github.com/Eyescale/Equalizer/compare/0ff3454578a1...73033d13dae9
------------------------------------------------------------------------------
Subversion Kills Productivity. Get off Subversion & Make the Move to Perforce.
With Perforce, you get hassle-free workflows. Merge that actually works. 
Faster operations. Version large binaries.  Built-in WAN optimization and the
freedom to use Git, Perforce or both. Make the move to Perforce.
http://pubads.g.doubleclick.net/gampad/clk?id=122218951&iu=/4140/ostg.clktrk
_______________________________________________
Equalizer-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/equalizer-commit
http://www.equalizergraphics.com

Reply via email to