From: Martin Taibr <taibr.martin@gmail.com>
Date: Sun, 8 Dec 2019 13:31:21 +0000 (+0100)
Subject: Merge branch 'master' into martin-t/linkexplode
X-Git-Tag: xonotic-v0.8.5~1105^2~15^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4ae3dd6b9141d0367deb73632255548710d81781;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into martin-t/linkexplode
---

4ae3dd6b9141d0367deb73632255548710d81781
diff --cc .gitlab-ci.yml
index ef89ee7aa9,8724d06617..8730235738
--- 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=c80adc89bf58bb22252dd0536b34126b
++
+     - EXPECT=892e447048e051e51f30cff2affc729a
      - HASH=$(${ENGINE} -noconfig -nohome +exec serverbench.cfg
        | tee /dev/stderr
        | grep '^:'