]> 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: 0ed8b28 55a8cb0)
Merge branch 'master' into HEAD
authorRudolf Polzer <divverent@alientrap.org>
Tue, 5 Oct 2010 19:07:10 +0000 (21:07 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 5 Oct 2010 19:07:10 +0000 (21:07 +0200)

Trivial merge