]> 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: 4e47c2a f20d0f7)
Merge remote branch 'origin/savagex/glowplant-gratefix'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 24 Oct 2010 11:52:08 +0000 (13:52 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 24 Oct 2010 11:52:08 +0000 (13:52 +0200)

Trivial merge