From: bones_was_here <bones_was_here@xonotic.au>
Date: Sun, 28 May 2023 04:38:13 +0000 (+1000)
Subject: Merge remote-tracking branch 'origin/master' into pending-release
X-Git-Tag: xonotic-v0.8.6~56^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2c788b04f4df7326baccf0f6a8d19613b3a9db7b;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/master' into pending-release
---

2c788b04f4df7326baccf0f6a8d19613b3a9db7b
diff --cc .gitlab-ci.yml
index 61a2cfef5,1feae253c..58d1e4582
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -75,7 -75,7 +75,7 @@@ test_sv_game
      - wget -nv -O data/maps/stormkeep.waypoints https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints
      - wget -nv -O data/maps/stormkeep.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.cache
  
-     - EXPECT=e7c012825007ed251efa4e52dfbb592e
 -    - EXPECT=20c9c4ea0364fbb611656cc0b876e02b
++    - EXPECT=b4bfc34b5a52ba950de9814c2c52c1c3
      - HASH=$(${ENGINE} +exec serverbench.cfg
        | tee /dev/stderr
        | grep '^:'