]> 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 | compact (merge: 12fb32c c9ade67)
Merge branch 'origin/master' (early part) into m0rfar/heaven
authorRudolf Polzer <divverent@alientrap.org>
Wed, 21 Jul 2010 10:01:32 +0000 (12:01 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 21 Jul 2010 10:01:32 +0000 (12:01 +0200)

Trivial merge