]> 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: 2d3aa4d 0e12e82)
Merge remote branch 'origin/fruitiex/glowplant'
authorRudolf Polzer <divVerent@xonotic.org>
Thu, 21 Oct 2010 16:29:50 +0000 (18:29 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Thu, 21 Oct 2010 16:29:50 +0000 (18:29 +0200)

Trivial merge