]> 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: 068f027 4ff407c)
Merge remote-tracking branch 'origin/terencehill/better_dom_hud_stats'
authorRudolf Polzer <divverent@xonotic.org>
Sat, 13 Aug 2011 12:10:04 +0000 (14:10 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sat, 13 Aug 2011 12:10:04 +0000 (14:10 +0200)

Trivial merge