]> 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: 52760f9 496313c)
Merge remote branch 'origin/terencehill/small_cleanups'
authorRudolf Polzer <divverent@alientrap.org>
Thu, 13 Jan 2011 06:08:38 +0000 (07:08 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 13 Jan 2011 06:08:38 +0000 (07:08 +0100)

Trivial merge