]> 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: bf2dedc 9699aed)
Merge branch 'Mario/balance'
authorMario <mario@smbclan.net>
Wed, 13 Jul 2016 07:30:54 +0000 (17:30 +1000)
committerMario <mario@smbclan.net>
Wed, 13 Jul 2016 07:30:54 +0000 (17:30 +1000)

Trivial merge