]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: a420550 8c9698f)
Merge branch 'master' into cbrutail/decals-xonotic
authorRudolf Polzer <divverent@alientrap.org>
Wed, 3 Nov 2010 08:06:42 +0000 (09:06 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 3 Nov 2010 08:06:42 +0000 (09:06 +0100)

Trivial merge