]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ba2dad4 febfec5)
Merge remote branch 'refs/remotes/origin/fruitiex/multijump'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 14 Aug 2010 16:27:00 +0000 (18:27 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 14 Aug 2010 16:27:00 +0000 (18:27 +0200)

Trivial merge