# HG changeset patch
# User nemo
# Date 1514480310 18000
# Node ID 3b93b6b7135be482e7eaf3ad627e16b13bf901fb
# Parent  4603b9916ea80df9693646b364c4a658397a7273# Parent  73ebc894a7255c9027b6ca350a6e2864b79d042f
merge into default too

diff -r 4603b9916ea8 -r 3b93b6b7135b gameServer/Actions.hs
--- a/gameServer/Actions.hs	Tue Dec 26 18:36:30 2017 -0500
+++ b/gameServer/Actions.hs	Thu Dec 28 11:58:30 2017 -0500
@@ -40,7 +40,7 @@
 import Network.Socket
 import System.Random
 import qualified Data.Traversable as DT
-import Text.Regex.Base
+import Text.Regex.TDFA
 import qualified Text.Regex.TDFA as TDFA
 import qualified Text.Regex.TDFA.ByteString as TDFAB
 -----------------------------
diff -r 4603b9916ea8 -r 3b93b6b7135b gameServer/hedgewars-server.cabal
--- a/gameServer/hedgewars-server.cabal	Tue Dec 26 18:36:30 2017 -0500
+++ b/gameServer/hedgewars-server.cabal	Thu Dec 28 11:58:30 2017 -0500
@@ -34,7 +34,8 @@
     SHA,
     entropy,
     zlib >= 0.5.3 && < 0.6,
-    regex-tdfa
+    regex-tdfa,
+    binary >= 0.8.5.1
 
   if !os(windows)
     build-depends: unix