]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: caa42d1 6e30b22)
Merge branch 'martin-t/testing-balance' into 'master'
authorMario <mario.mario@y7mail.com>
Sun, 5 Apr 2020 17:38:26 +0000 (17:38 +0000)
committerMario <mario.mario@y7mail.com>
Sun, 5 Apr 2020 17:38:26 +0000 (17:38 +0000)
Granular testing balance using votes

See merge request xonotic/xonotic-data.pk3dir!766

1  2 
check-cvars.sh patch | diff1 | diff2 | blob | history
commands.cfg patch | diff1 | diff2 | blob | history
xonotic-server.cfg patch | diff1 | diff2 | blob | history

diff --cc check-cvars.sh
Simple merge
diff --cc commands.cfg
Simple merge
diff --cc xonotic-server.cfg
Simple merge