From: Mario <mario.mario@y7mail.com>
Date: Tue, 6 Aug 2024 07:54:01 +0000 (+1000)
Subject: Merge branch 'master' into Mario/electro_combo_over_time
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4966300e0f98bc728680320f7ec9e083b16c430f;p=xonotic%2Fxonotic-data.pk3dir.git

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

4966300e0f98bc728680320f7ec9e083b16c430f
diff --cc .gitlab-ci.yml
index 21bef8d5d,55eb8a1bb..0bca6f4e8
--- 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=7b432dcf92ddf6919d12eef3b14cae54
 -    - export EXPECT=e67187c8446f97a8b062a431dccb89e0
++    - export EXPECT=8aec9e8dd8fb0a69e500979f67d4f7e8
      - qcsrc/tools/sv_game-hashtest.sh
      - exit $?