[eq-commit] [Eyescale/Equalizer] b25313: window build fixes

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

  Branch: refs/heads/master
  Home:   https://github.com/Eyescale/Equalizer
  Commit: b2531357445cb0821283dda7b5abd965802909d5
      https://github.com/Eyescale/Equalizer/commit/b2531357445cb0821283dda7b5abd965802909d5
  Author: Stefan Eilemann <eil...@gm...>
  Date:   2012-03-16 (Fri, 16 Mar 2012)

  Changed paths:
    M libs/co/node.h

  Log Message:
  -----------
  window build fixes


  Commit: 0a5aad7277f9f2b763cb3173d5f327859996a01e
      https://github.com/Eyescale/Equalizer/commit/0a5aad7277f9f2b763cb3173d5f327859996a01e
  Author: Stefan Eilemann <eil...@gm...>
  Date:   2012-03-16 (Fri, 16 Mar 2012)

  Changed paths:
    M ACKNOWLEDGEMENTS
    M libs/co/barrier.cpp
    M libs/co/barrier.h
    M libs/co/bufferConnection.h
    A libs/co/compressor/compressorFastLZ.cpp
    A libs/co/compressor/compressorFastLZ.h
    A libs/co/compressor/fastlz/6pack.c
    A libs/co/compressor/fastlz/6unpack.c
    A libs/co/compressor/fastlz/LICENSE
    A libs/co/compressor/fastlz/README.TXT
    A libs/co/compressor/fastlz/fastlz.c
    A libs/co/compressor/fastlz/fastlz.h
    M libs/co/cpuCompressor.cpp
    M libs/co/dataOStream.cpp
    M libs/co/files.cmake
    M libs/co/global.cpp
    M libs/co/global.h
    M libs/co/node.h
    M libs/co/plugins/compressorTypes.h

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

Conflicts:
	libs/co/node.h


  Commit: 9321d3e1201ccbfb849834d07a9537dae2fab65f
      https://github.com/Eyescale/Equalizer/commit/9321d3e1201ccbfb849834d07a9537dae2fab65f
  Author: Stefan Eilemann <eil...@gm...>
  Date:   2012-03-20 (Tue, 20 Mar 2012)

  Changed paths:
    M ACKNOWLEDGEMENTS
    M CMake/CPackConfig.cmake
    M CMake/Common.cmake
    M CMake/CommonCPack.cmake
    M CMake/Equalizer.spec
    M CMake/FindCODASH.cmake
    M CMake/FindCollage.cmake
    M CMake/FindEqualizer.cmake
    M CMake/FindLibraryPackage.cmake
    M CMake/FindMonsteer.cmake
    M CMake/GitTargets.cmake
    A CMake/rpmPostInstall.sh
    M CMakeLists.txt
    M doc/Doxyfile.Collage
    M doc/Doxyfile.Equalizer
    M doc/Doxyfile.Sequel
    M examples/eqPly/localInitData.cpp
    M examples/seqPly/application.cpp
    M libs/co/CMakeLists.txt
    A libs/co/barrierCommand.h
    M libs/co/barrierPackets.h
    M libs/co/bufferConnection.cpp
    M libs/co/command.cpp
    M libs/co/command.h
    M libs/co/commandCache.cpp
    M libs/co/commandCache.h
    M libs/co/commandFunc.h
    M libs/co/commandQueue.cpp
    M libs/co/commandQueue.h
    M libs/co/commands.h
    M libs/co/compressor/compressorFastLZ.cpp
    M libs/co/compressor/compressorLZF.cpp
    M libs/co/compressor/compressorRLEB.cpp
    A libs/co/compressor/compressorSnappy.cpp
    A libs/co/compressor/compressorSnappy.h
    A libs/co/compressor/snappy/AUTHORS
    A libs/co/compressor/snappy/COPYING
    A libs/co/compressor/snappy/ChangeLog
    A libs/co/compressor/snappy/INSTALL
    A libs/co/compressor/snappy/Makefile.am
    A libs/co/compressor/snappy/NEWS
    A libs/co/compressor/snappy/README
    A libs/co/compressor/snappy/autogen.sh
    A libs/co/compressor/snappy/config.guess
    A libs/co/compressor/snappy/config.sub
    A libs/co/compressor/snappy/configure.ac
    A libs/co/compressor/snappy/depcomp
    A libs/co/compressor/snappy/format_description.txt
    A libs/co/compressor/snappy/framing_format.txt
    A libs/co/compressor/snappy/install-sh
    A libs/co/compressor/snappy/ltmain.sh
    A libs/co/compressor/snappy/m4/gtest.m4
    A libs/co/compressor/snappy/missing
    A libs/co/compressor/snappy/snappy-c.cc
    A libs/co/compressor/snappy/snappy-c.h
    A libs/co/compressor/snappy/snappy-internal.h
    A libs/co/compressor/snappy/snappy-sinksource.cc
    A libs/co/compressor/snappy/snappy-sinksource.h
    A libs/co/compressor/snappy/snappy-stubs-internal.cc
    A libs/co/compressor/snappy/snappy-stubs-internal.h
    A libs/co/compressor/snappy/snappy-stubs-public.h
    A libs/co/compressor/snappy/snappy-stubs-public.h.in
    A libs/co/compressor/snappy/snappy-test.cc
    A libs/co/compressor/snappy/snappy-test.h
    A libs/co/compressor/snappy/snappy.cc
    A libs/co/compressor/snappy/snappy.h
    A libs/co/compressor/snappy/snappy_unittest.cc
    M libs/co/compressorInfo.h
    M libs/co/connection.cpp
    M libs/co/connection.h
    M libs/co/connectionDescription.cpp
    M libs/co/connectionDescription.h
    M libs/co/connectionType.h
    M libs/co/connections.h
    M libs/co/cpuCompressor.cpp
    M libs/co/dataIStreamQueue.cpp
    M libs/co/deltaMasterCM.cpp
    M libs/co/dispatcher.cpp
    M libs/co/dispatcher.h
    M libs/co/eventConnection.cpp
    M libs/co/fdConnection.cpp
    M libs/co/files.cmake
    M libs/co/fullMasterCM.cpp
    M libs/co/instanceCache.cpp
    M libs/co/instanceCache.h
    M libs/co/localNode.cpp
    M libs/co/localNode.h
    M libs/co/namedPipeConnection.cpp
    M libs/co/node.cpp
    A libs/co/nodeCommand.h
    M libs/co/nodePackets.h
    M libs/co/nullCM.h
    A libs/co/objectCommand.h
    M libs/co/objectDataIStream.cpp
    M libs/co/objectDataIStream.h
    M libs/co/objectPackets.h
    M libs/co/objectStore.cpp
    M libs/co/objectStore.h
    R libs/co/pgmConnection.cpp
    R libs/co/pgmConnection.h
    M libs/co/pipeConnection.cpp
    M libs/co/plugin.cpp
    M libs/co/plugins/compressorTypes.h
    A libs/co/queueCommand.h
    M libs/co/queueMaster.cpp
    M libs/co/queuePackets.h
    M libs/co/queueSlave.cpp
    M libs/co/queueSlave.h
    M libs/co/rdmaConnection.cpp
    M libs/co/rdmaConnection.h
    M libs/co/rspConnection.cpp
    M libs/co/rspConnection.h
    M libs/co/socketConnection.cpp
    M libs/co/staticSlaveCM.cpp
    M libs/co/types.h
    M libs/co/udtConnection.cpp
    M libs/co/unbufferedMasterCM.cpp
    M libs/co/versionedMasterCM.cpp
    M libs/co/versionedSlaveCM.cpp
    M libs/co/worker.ipp
    M libs/eq/client/channel.cpp
    M libs/eq/client/client.cpp
    M libs/eq/client/commandQueue.cpp
    M libs/eq/client/commandQueue.h
    M libs/eq/client/config.cpp
    M libs/eq/client/glx/X11Connection.h
    M libs/eq/client/node.cpp
    M libs/eq/client/pipe.cpp
    M libs/eq/client/view.cpp
    M libs/eq/fabric/client.cpp
    M libs/eq/fabric/client.h
    M libs/eq/server/loader.l
    M libs/eq/server/loader.y
    M libs/eq/server/server.cpp
    M libs/eq/server/server.h
    M tests/co/commandCache.cpp
    M tests/co/compressor.cpp
    M tests/co/dataStream.cpp
    M tests/co/dispatcher.cpp
    M tests/co/instanceCache.cpp
    M tests/co/queue.cpp
    M tools/CMakeLists.txt
    M tools/netperf/netperf.cpp
    R tools/netproxy/netproxy.cpp

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


Compare: https://github.com/Eyescale/Equalizer/compare/e7808dd34b07...9321d3e1201c