]> 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: 0160915 50387f7)
Merge branch 'master' into divVerent/abandoned-by-kuniu
authorRudolf Polzer <divverent@alientrap.org>
Wed, 29 Sep 2010 18:03:58 +0000 (20:03 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 29 Sep 2010 18:03:58 +0000 (20:03 +0200)

Trivial merge