From: Lyberta <lyberta@lyberta.net>
Date: Sun, 11 Feb 2018 02:41:33 +0000 (+0300)
Subject: Merge branch 'Lyberta/Survival' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1e50745b6e87ca401cc159826a7c2213e19e4fb9;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Lyberta/Survival' into Lyberta/master
---

1e50745b6e87ca401cc159826a7c2213e19e4fb9
diff --cc .gitlab-ci.yml
index 9cb41d2d73,e6ecbcbcb3..188c8f7632
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -29,7 -29,7 +29,8 @@@ test_sv_game
      - wget -O data/maps/stormkeep.waypoints https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints
      - wget -O data/maps/stormkeep.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.cache
      - make
 +    - EXPECT=65ca7b997c01a5ad468a7a5dccd32044
+     - EXPECT=d1a65371174a5210320fa85b3f059d0f
      - HASH=$(${ENGINE} -noconfig -nohome +exec serverbench.cfg
        | tee /dev/stderr
        | grep '^:'