From: Mario <mario.mario@y7mail.com>
Date: Tue, 24 Sep 2024 15:05:24 +0000 (+1000)
Subject: Merge branch 'master' into Mario/electro_combo_over_time
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=077d7abbef2f6ba20bf980ff43a87a12d369a7dc;p=xonotic%2Fxonotic-data.pk3dir.git

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

077d7abbef2f6ba20bf980ff43a87a12d369a7dc
diff --cc .gitlab-ci.yml
index d27e6837e,c0057d597..4eda37714
--- 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=2fc7c0b22c9d397162e552a2e48256c3
 -    - export EXPECT=13aa630f559c7683195b8c8d5e0a1522
++    - export EXPECT=10ddd4483a30f78a0aa95d9d0d573659
      - qcsrc/tools/sv_game-hashtest.sh
      - exit $?