]> 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 | compact (merge: ccbf613 1c83cb0)
Merge remote branch 'refs/remotes/origin/fruitiex/stormkeepjumppadfix'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 22 Oct 2010 16:02:20 +0000 (18:02 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 22 Oct 2010 16:02:20 +0000 (18:02 +0200)

Trivial merge