]> 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: 85de9e3 d08987d)
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-maps.pk3dir
authorRudolf Polzer <divverent@xonotic.org>
Sun, 21 Aug 2011 17:22:57 +0000 (19:22 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sun, 21 Aug 2011 17:22:57 +0000 (19:22 +0200)

Trivial merge