]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7052bab 06be0b4)
Merge branch 'master' into Mario/shockwave_removal
authorMario <mario.mario@y7mail.com>
Wed, 20 Nov 2024 22:39:44 +0000 (08:39 +1000)
committerMario <mario.mario@y7mail.com>
Wed, 20 Nov 2024 22:39:44 +0000 (08:39 +1000)
1  2 
.gitlab-ci.yml patch | diff1 | diff2 | blob | history
bal-wep-xdf.cfg patch | diff1 | diff2 | blob | history
bal-wep-xonotic.cfg patch | diff1 | diff2 | blob | history
xonotic-client.cfg patch | diff1 | diff2 | blob | history

diff --cc .gitlab-ci.yml
index a9b2a9a0feb55ab5356bb92d7c6547f9014ea674,ce1123086c1f4a1c3a176d38ea4f2add5037f739..7cde248f1fdab5b82a8086c6a618b44a1b611a91
--- 1/.gitlab-ci.yml
--- 2/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -36,7 -36,7 +36,7 @@@ test_compilation_units
  test_sv_game:
    stage: test
    script:
-     - export EXPECT=9270a60e467b064b3bb409d054550da4
 -    - export EXPECT=4e959184d76f77e368ab5bf445c63cc9
++    - export EXPECT=1dc3d94eb25b8a0c74192656297b08ef
      - qcsrc/tools/sv_game-hashtest.sh
      - exit $?
  
diff --cc bal-wep-xdf.cfg
Simple merge
diff --cc bal-wep-xonotic.cfg
Simple merge
diff --cc xonotic-client.cfg
Simple merge