]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e27d1c3 ac62d27)
Merge branch 'master' into morphed/narmorx
authorRudolf Polzer <divverent@alientrap.org>
Tue, 28 Sep 2010 10:00:38 +0000 (12:00 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 28 Sep 2010 10:00:38 +0000 (12:00 +0200)

Trivial merge