]> 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: 50f6742 404d385)
Merge remote branch 'origin/fruitiex/race_nouid_norec'
authorRudolf Polzer <divverent@alientrap.org>
Mon, 15 Nov 2010 20:48:10 +0000 (21:48 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 15 Nov 2010 20:48:10 +0000 (21:48 +0100)

Trivial merge