]> 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 | compact (merge: 459087d 38161f6)
Merge branch 'master' into Mirio/balance
authorMirio <opivy@hotmail.de>
Fri, 15 Jan 2016 15:35:51 +0000 (16:35 +0100)
committerMirio <opivy@hotmail.de>
Fri, 15 Jan 2016 15:35:51 +0000 (16:35 +0100)

Trivial merge