]> 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: 57f8365 a8e9000)
Merge branch 'master' into terencehill/unlimited_ammo_fixes
authorterencehill <piuntn@gmail.com>
Wed, 15 Apr 2015 22:47:56 +0000 (00:47 +0200)
committerterencehill <piuntn@gmail.com>
Wed, 15 Apr 2015 22:47:56 +0000 (00:47 +0200)

Trivial merge