]> 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: e4ae40e 98bf0d2)
Merge remote-tracking branch 'origin/morphed/pillar', closes #1256
authorRudolf Polzer <divverent@xonotic.org>
Tue, 29 Jan 2013 19:33:06 +0000 (20:33 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Tue, 29 Jan 2013 19:33:06 +0000 (20:33 +0100)

Trivial merge