]> 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: 16b1910 98038bf)
Implement https://xonotic.org/balancevotes/25/
authordrjaska <drjaska83@gmail.com>
Tue, 19 Nov 2024 03:36:05 +0000 (05:36 +0200)
committerdrjaska <drjaska83@gmail.com>
Tue, 19 Nov 2024 03:36:05 +0000 (05:36 +0200)
Merge branch 'bones_was_here/crylink_pri'

1  2 
.gitlab-ci.yml patch | diff1 | diff2 | blob | history
bal-wep-xonotic.cfg patch | diff1 | diff2 | blob | history

diff --cc .gitlab-ci.yml
index 16e13d91ce836ee09964b9efe5717004966c8015,1b3fad83590156198c569c958e35bf8bc6f785ca..ce1123086c1f4a1c3a176d38ea4f2add5037f739
--- 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=49dd33d7cc256afd1948271facfaf948
 -    - export EXPECT=6102445105f1647b085d59a8419970a9
++    - export EXPECT=4e959184d76f77e368ab5bf445c63cc9
      - qcsrc/tools/sv_game-hashtest.sh
      - exit $?
  
diff --cc bal-wep-xonotic.cfg
Simple merge