[eq-commit] [Eyescale/Equalizer] 405f45: Compilation fix.

[GitHub <no...@gi...>]

  Branch: refs/heads/master
  Home:   https://github.com/Eyescale/Equalizer
  Commit: 405f4530aa75b72ad483da47f60490e52e51adec
      https://github.com/Eyescale/Equalizer/commit/405f4530aa75b72ad483da47f60490e52e51adec
  Author: Juan Hernando <jhe...@fi...>
  Date:   2013-01-14 (Mon, 14 Jan 2013)

  Changed paths:
    M eq/server/server.cpp

  Log Message:
  -----------
  Compilation fix.


  Commit: 90c12f5a2f599062d8ad66ed710131abeb2f00f7
      https://github.com/Eyescale/Equalizer/commit/90c12f5a2f599062d8ad66ed710131abeb2f00f7
  Author: Juan Hernando <jhe...@fi...>
  Date:   2013-01-14 (Mon, 14 Jan 2013)

  Changed paths:
    M eq/server/config/resources.cpp
    M eq/server/config/server.cpp
    M eq/server/server.cpp

  Log Message:
  -----------
  Compilation fixes.


  Commit: 13659344fba6d2d9896f79cbd18e0d173c995ce2
      https://github.com/Eyescale/Equalizer/commit/13659344fba6d2d9896f79cbd18e0d173c995ce2
  Author: Juan Hernando <jhe...@fi...>
  Date:   2013-01-14 (Mon, 14 Jan 2013)

  Changed paths:
    M eq/server/config/resources.cpp
    M eq/server/config/server.cpp

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


  Commit: 19ca0ed8dbdd67d7759de591438bcdf91e821e51
      https://github.com/Eyescale/Equalizer/commit/19ca0ed8dbdd67d7759de591438bcdf91e821e51
  Author: Stefan Eilemann <ei...@ey...>
  Date:   2013-01-14 (Mon, 14 Jan 2013)

  Changed paths:
    M eq/server/config/resources.cpp
    M eq/server/config/server.cpp
    M eq/server/server.cpp

  Log Message:
  -----------
  Merge pull request #193 from hernando/master

Compilation fixes


Compare: https://github.com/Eyescale/Equalizer/compare/00af2ed3d033...19ca0ed8dbdd