Mercurial Mercurial > hedgewars / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge, mah friend, long time no see
authorkoda
Wed, 03 Jun 2015 14:52:30 +0100
changeset 10980 c1ef8a7da0c6
parent 10979 a332a60df7ce (current diff)
parent 10977 b2823ea26631 (diff)
child 10981 c92456ecdbad
merge, mah friend, long time no see
--- 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` ()
--- 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
hedgewars