From: Mario <mario.mario@y7mail.com>
Date: Tue, 17 Sep 2024 04:51:50 +0000 (+1000)
Subject: Merge branch 'master' into Mario/electro_combo_over_time
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fheads%2FMario%2Felectro_combo_over_time;p=xonotic%2Fxonotic-data.pk3dir.git

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

50312d6e2e1e6e04aa017c6d12df4f10408cc975
diff --cc .gitlab-ci.yml
index 2d83b2906,3d2d310a0..d27e6837e
--- 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=f42b46132cecd1a3516f6196ef8ece98
 -    - export EXPECT=82b429be1301d38fbe0af0c60511ceed
++    - export EXPECT=2fc7c0b22c9d397162e552a2e48256c3
      - qcsrc/tools/sv_game-hashtest.sh
      - exit $?