]> 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: c06a3a1 1d7815c)
Merge branch 'terencehill/campaign_balance_fix' into 'master'
authorMario <mario.mario@y7mail.com>
Sat, 28 Dec 2019 13:40:52 +0000 (13:40 +0000)
committerMario <mario.mario@y7mail.com>
Sat, 28 Dec 2019 13:40:52 +0000 (13:40 +0000)
Campaign balance fix

Closes #2364

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


Trivial merge