[eq-commit] [Eyescale/Equalizer] 18b48d: Potential fix for #162: WGL window compile error

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

  Branch: refs/heads/master
  Home:   https://github.com/Eyescale/Equalizer
  Commit: 18b48db4a5c26699457ea696b4c2f158a41c730a
      https://github.com/Eyescale/Equalizer/commit/18b48db4a5c26699457ea696b4c2f158a41c730a
  Author: Stefan Eilemann <eil...@gm...>
  Date:   2012-09-08 (Sat, 08 Sep 2012)

  Changed paths:
    M libs/eq/client/glx/types.h
    M libs/eq/client/wgl/types.h

  Log Message:
  -----------
  Potential fix for #162: WGL window compile error


  Commit: 9eab556bfd165b9e9601210433075486e74d2454
      https://github.com/Eyescale/Equalizer/commit/9eab556bfd165b9e9601210433075486e74d2454
  Author: Stefan Eilemann <eil...@gm...>
  Date:   2012-09-08 (Sat, 08 Sep 2012)

  Changed paths:
    M libs/eq/client/wgl/types.h

  Log Message:
  -----------
  Iterate on fix for #162: WGL window compile error


  Commit: 54319514511025ec3c574f33dbe406d9e9a3bdfa
      https://github.com/Eyescale/Equalizer/commit/54319514511025ec3c574f33dbe406d9e9a3bdfa
  Author: Daniel Nachbaur <dan...@gm...>
  Date:   2012-09-08 (Sat, 08 Sep 2012)

  Changed paths:
    M libs/eq/client/os.h
    M libs/eq/client/wgl/types.h
    M libs/eq/client/wgl/window.h

  Log Message:
  -----------
  Fix #162: WGL window compile error


  Commit: 66fb91d7158941ac4367143e63c2a69cce527b33
      https://github.com/Eyescale/Equalizer/commit/66fb91d7158941ac4367143e63c2a69cce527b33
  Author: Daniel Nachbaur <dan...@gm...>
  Date:   2012-09-08 (Sat, 08 Sep 2012)

  Changed paths:
    M libs/eq/client/os.h
    M libs/eq/client/wgl/types.h
    M libs/eq/client/wgl/window.h

  Log Message:
  -----------
  Fix #162: WGL window compile error


  Commit: 4d90c2f63dcdabcc6d5e832ece77d315e2af71ea
      https://github.com/Eyescale/Equalizer/commit/4d90c2f63dcdabcc6d5e832ece77d315e2af71ea
  Author: Stefan Eilemann <eil...@gm...>
  Date:   2012-09-08 (Sat, 08 Sep 2012)

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


  Commit: 05691fa3555a6bc5d5b4f7bdd76845a79e40dd0d
      https://github.com/Eyescale/Equalizer/commit/05691fa3555a6bc5d5b4f7bdd76845a79e40dd0d
  Author: Stefan Eilemann <eil...@gm...>
  Date:   2012-09-08 (Sat, 08 Sep 2012)

  Changed paths:
    M CMakeLists.txt

  Log Message:
  -----------
  Bump version


  Commit: e3defa3982077810647080bc1f877b64db36bbde
      https://github.com/Eyescale/Equalizer/commit/e3defa3982077810647080bc1f877b64db36bbde
  Author: Stefan Eilemann <eil...@gm...>
  Date:   2012-09-08 (Sat, 08 Sep 2012)

  Changed paths:
    M libs/eq/client/glx/types.h
    M libs/eq/client/os.h
    M libs/eq/client/wgl/types.h
    M libs/eq/client/wgl/window.h

  Log Message:
  -----------
  Merge branch '1.4'

Conflicts:
	CMakeLists.txt
	libs/eq/client/wgl/window.h


Compare: https://github.com/Eyescale/Equalizer/compare/f64bfac31527...e3defa398207