]> de.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: 762a3c2 5014850)
Merge branch 'Mirio/balance' into 'master'
authorMario <zacjardine@y7mail.com>
Sat, 31 Dec 2016 05:29:39 +0000 (05:29 +0000)
committerMario <zacjardine@y7mail.com>
Sat, 31 Dec 2016 05:29:39 +0000 (05:29 +0000)
Mirio/balance

See merge request !291


Trivial merge