]> 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: 326645c 8e0a92d)
Merge branch 'master' into divVerent/abandoned-by-kuniu
authorRudolf Polzer <divverent@alientrap.org>
Fri, 1 Oct 2010 21:30:59 +0000 (23:30 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 1 Oct 2010 21:30:59 +0000 (23:30 +0200)

Trivial merge