]> 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: ae74e0a 74f87fc)
Merge branch 'master' into terencehill/better_dom_hud_stats
authorterencehill <piuntn@gmail.com>
Wed, 27 Jul 2011 10:52:18 +0000 (12:52 +0200)
committerterencehill <piuntn@gmail.com>
Wed, 27 Jul 2011 10:52:18 +0000 (12:52 +0200)

Trivial merge