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

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

3a00dc692e7c0b8410f356a61bc610e094fc79eb
diff --cc .gitlab-ci.yml
index f144008ddd,16e13d91ce..05d1f289e3
--- 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=68767d02998c4c842f592e1c916eaebe
 -    - export EXPECT=49dd33d7cc256afd1948271facfaf948
++    - export EXPECT=6ca6457473935e3b7b8ba21ae76032ee
      - qcsrc/tools/sv_game-hashtest.sh
      - exit $?