]> 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 | combined (merge: 2acf9d8 8c128c1)
Merge remote branch 'origin/cbrutail/decals-xonotic'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 6 Nov 2010 07:34:57 +0000 (08:34 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 6 Nov 2010 07:34:57 +0000 (08:34 +0100)

Trivial merge