]> 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: 0a790f8 75f0717)
Merge branch 'master' into terencehill/freezetag_fixes
authorterencehill <piuntn@gmail.com>
Thu, 5 Apr 2012 09:27:24 +0000 (11:27 +0200)
committerterencehill <piuntn@gmail.com>
Thu, 5 Apr 2012 09:27:24 +0000 (11:27 +0200)

Trivial merge