]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 3c81f71 913729b)
Merge remote branch 'remotes/origin/terencehill/newpanelhud-dom_points' into terenceh...
authorterencehill <piuntn@gmail.com>
Wed, 20 Oct 2010 22:01:45 +0000 (00:01 +0200)
committerterencehill <piuntn@gmail.com>
Wed, 20 Oct 2010 22:01:45 +0000 (00:01 +0200)

Trivial merge