]> 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: 3227ecf 790f9de)
Merge remote branch 'origin/fruitiex/jumppadlod'
authorRudolf Polzer <divverent@alientrap.org>
Mon, 1 Nov 2010 21:14:48 +0000 (22:14 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 1 Nov 2010 21:14:48 +0000 (22:14 +0100)

Trivial merge