From: drjaska <drjaska83@gmail.com>
Date: Tue, 19 Nov 2024 18:44:37 +0000 (+0200)
Subject: Merge branch 'master' into drjaska/gib-ghost
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F1219%2Fhead;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into drjaska/gib-ghost
---

b865cfe32e69603278e3a76ef1f8fbdb1ca72a9d
diff --cc .gitlab-ci.yml
index 48573bc3d,ce1123086..aaa01fa28
--- 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=1b80629ffd60bdd46befff04559d1fb9
 -    - export EXPECT=4e959184d76f77e368ab5bf445c63cc9
++    - export EXPECT=81acabc17714161feb1dd26af2aeba90
      - qcsrc/tools/sv_game-hashtest.sh
      - exit $?