]> 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: 3568990 db35813)
Merge remote-tracking branch 'origin/morphed/crate02'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 22 Apr 2011 15:47:42 +0000 (17:47 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 22 Apr 2011 15:47:42 +0000 (17:47 +0200)

Trivial merge