Merge remote-tracking branch 'fpco/master' into update-opengl-related-pacakge-and-maintainer

This commit is contained in:
Rémi Vion 2015-08-26 12:14:58 +02:00
commit eb72c50465

View File

@ -191,6 +191,13 @@ packages:
- psqueues
- websockets
"haskell-opengl":
- OpenGL
- GLURaw
- GLUT
- OpenGLRaw
- StateVar
"Antoine Latter":
- byteorder
- uuid
@ -1313,10 +1320,16 @@ packages:
"Michael Walker <mike@barrucadu.co.uk> @barrucadu":
- both
- irc-ctcp
- irc-conduit
- irc-client
"Trevor Elliott <awesomelyawesome@gmail.com> @elliottt":
- irc
"Dennis Gosnell <cdep.illabout@gmail.com> @cdepillabout":
- ig
"Stackage upper bounds":
# https://github.com/fpco/stackage/issues/537
- zlib < 0.6
@ -1743,9 +1756,6 @@ expected-test-failures:
# https://github.com/haskell/haddock/issues/390 GHC 7.10
- haddock-library
# https://github.com/ekmett/machines/issues/44
- machines
# https://github.com/haskell/ghc-events/issues/9
- ghc-events
@ -1931,3 +1941,9 @@ github-users:
- meteficha
analytics:
- ekmett
haskell-opengl:
- ekmett
# - svenpanne
# - elliottt
# - jmcarthur