From: Mario <mario.mario@y7mail.com>
Date: Mon, 9 Dec 2024 03:36:48 +0000 (+1000)
Subject: Merge branch 'master' into Mario/shockwave_removal
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F1381%2Fhead;p=xonotic%2Fxonotic-data.pk3dir.git

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

0990ba01b3a4751c8e6955705906b7e036c37aa5
diff --cc .gitlab-ci.yml
index 7cde248f1,81a98fa72..7c4ae6a2b
--- 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=1dc3d94eb25b8a0c74192656297b08ef
 -    - export EXPECT=f5fbfbd04a22e781397cfd14db367419
++    - export EXPECT=601b58ab0baed5060eb18c8fc084e072
      - qcsrc/tools/sv_game-hashtest.sh
      - exit $?