]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a3bc20a b458653)
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir into sev/hudlayout
authorsev <sev.ch@web.de>
Wed, 30 Mar 2011 20:26:58 +0000 (22:26 +0200)
committersev <sev.ch@web.de>
Wed, 30 Mar 2011 20:26:58 +0000 (22:26 +0200)

Trivial merge