From: Lyberta <lyberta@lyberta.net>
Date: Wed, 4 Apr 2018 16:54:15 +0000 (+0300)
Subject: Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=25e676aaec3773c33896315128323850500c765c;p=xonotic%2Fxonotic-data.pk3dir.git

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

25e676aaec3773c33896315128323850500c765c
diff --cc .gitlab-ci.yml
index 43e3df8554,4754425bf9..1d781d183d
--- 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=422d5d8a0490e961463fda69da1975bc
+     - EXPECT=fb771b180a47f7acf09eb12dddd391f8
      - HASH=$(${ENGINE} -noconfig -nohome +exec serverbench.cfg
        | tee /dev/stderr
        | grep '^:'