]> 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 | combined (merge: 15b454a 893785b)
Merge remote branch 'refs/remotes/origin/terencehill/dom_points'
authorRudolf Polzer <divverent@alientrap.org>
Wed, 21 Jul 2010 18:27:07 +0000 (20:27 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 21 Jul 2010 18:27:07 +0000 (20:27 +0200)

Trivial merge