Merge branch 'master' into martin-t/linkexplode
authorMartin Taibr <taibr.martin@gmail.com>
Sun, 8 Dec 2019 13:31:21 +0000 (14:31 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Sun, 8 Dec 2019 13:31:21 +0000 (14:31 +0100)
1  2 
.gitlab-ci.yml
bal-wep-xonotic.cfg
bal-wep-xpm.cfg

diff --cc .gitlab-ci.yml
@@@ -29,7 -29,7 +29,8 @@@ test_sv_game
      - wget -O data/maps/stormkeep.waypoints https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints
      - wget -O data/maps/stormkeep.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.cache
      - make
-     - EXPECT=c80adc89bf58bb22252dd0536b34126b
++
+     - EXPECT=892e447048e051e51f30cff2affc729a
      - HASH=$(${ENGINE} -noconfig -nohome +exec serverbench.cfg
        | tee /dev/stderr
        | grep '^:'
Simple merge
diff --cc bal-wep-xpm.cfg
Simple merge