From: Mario <mario.mario@y7mail.com>
Date: Wed, 20 Nov 2024 22:39:44 +0000 (+1000)
Subject: Merge branch 'master' into Mario/shockwave_removal
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=64f396f302abd416fabbeffa5a001b8c0d2d25b5;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/shockwave_removal
---

64f396f302abd416fabbeffa5a001b8c0d2d25b5
diff --cc .gitlab-ci.yml
index a9b2a9a0f,ce1123086..7cde248f1
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -36,7 -36,7 +36,7 @@@ test_compilation_units
  test_sv_game:
    stage: test
    script:
-     - export EXPECT=9270a60e467b064b3bb409d054550da4
 -    - export EXPECT=4e959184d76f77e368ab5bf445c63cc9
++    - export EXPECT=1dc3d94eb25b8a0c74192656297b08ef
      - qcsrc/tools/sv_game-hashtest.sh
      - exit $?