]> 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: bfd524d 7b99d36)
Merge remote branch 'origin/terencehill/typos'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 5 Feb 2011 19:14:27 +0000 (20:14 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 5 Feb 2011 19:14:27 +0000 (20:14 +0100)

Trivial merge