]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f899671 46dc92d)
Merge branch 'master' into terencehill/unlimited_ammo_fixes
authorterencehill <piuntn@gmail.com>
Sun, 5 Apr 2015 22:54:48 +0000 (00:54 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 5 Apr 2015 22:54:48 +0000 (00:54 +0200)

Trivial merge