]> 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: 5720f32 2a89475)
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-maps.pk3dir into cbrut...
authorcbrutail <ruszkai.akos@gmail.com>
Mon, 1 Nov 2010 14:32:14 +0000 (15:32 +0100)
committercbrutail <ruszkai.akos@gmail.com>
Mon, 1 Nov 2010 14:32:14 +0000 (15:32 +0100)

Trivial merge