]> 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: 6ae2ac1 4768c37)
Merge branch 'master' into fruitiex/warpzone
authorRudolf Polzer <divverent@alientrap.org>
Wed, 21 Jul 2010 11:10:57 +0000 (13:10 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 21 Jul 2010 11:10:57 +0000 (13:10 +0200)

Trivial merge