]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bb8a5ba 53ec6ce)
Merge remote branch 'origin/master' into fruitiex/jumppadmodel1
authorRudolf Polzer <divverent@alientrap.org>
Wed, 21 Jul 2010 10:04:52 +0000 (12:04 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 21 Jul 2010 10:04:52 +0000 (12:04 +0200)

Trivial merge