]> 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: b95d196 515af77)
Merge remote branch 'origin/terencehill/misc_bugfixes'
authorRudolf Polzer <divVerent@xonotic.org>
Wed, 23 Mar 2011 06:12:06 +0000 (07:12 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Wed, 23 Mar 2011 06:12:06 +0000 (07:12 +0100)

Trivial merge