From: Mario <mario.mario@y7mail.com>
Date: Thu, 3 Oct 2024 15:33:13 +0000 (+1000)
Subject: Merge branch 'master' into Mario/electro_combo_over_time
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=532cc506149c48ea565f851c7d25c793574c1df7;p=xonotic%2Fxonotic-data.pk3dir.git

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

532cc506149c48ea565f851c7d25c793574c1df7
diff --cc .gitlab-ci.yml
index 4eda37714,d1ed8f093..f144008dd
--- 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=10ddd4483a30f78a0aa95d9d0d573659
 -    - export EXPECT=7004fcba787d0fbe17240beb84d8af3c
++    - export EXPECT=68767d02998c4c842f592e1c916eaebe
      - qcsrc/tools/sv_game-hashtest.sh
      - exit $?