# HG changeset patch
# User koda
# Date 1433339550 -3600
# Node ID c1ef8a7da0c61c9c3fb06de336509920103dded2
# Parent  a332a60df7ce13b7468bb5613121944b9385740a# Parent  b2823ea26631508308731aef782508b57b90ffc5
merge, mah friend, long time no see

diff -r a332a60df7ce -r c1ef8a7da0c6 gameServer/CoreTypes.hs
--- a/gameServer/CoreTypes.hs	Wed Jun 03 22:16:03 2015 +0900
+++ b/gameServer/CoreTypes.hs	Wed Jun 03 14:52:30 2015 +0100
@@ -38,7 +38,7 @@
 instance NFData B.ByteString
 #endif
 
-instance NFData (Chan a)
+instance NFData (Chan a) where rnf a  = ()
 
 instance NFData Action where
     rnf (AnswerClients chans msg) = chans `deepseq` msg `deepseq` ()
diff -r a332a60df7ce -r c1ef8a7da0c6 gameServer/hedgewars-server.cabal
--- a/gameServer/hedgewars-server.cabal	Wed Jun 03 22:16:03 2015 +0900
+++ b/gameServer/hedgewars-server.cabal	Wed Jun 03 14:52:30 2015 +0100
@@ -33,7 +33,7 @@
     utf8-string,
     SHA,
     entropy,
-    zlib
+    zlib >= 0.5.3 && < 0.6
 
   if !os(windows)
     build-depends: unix