]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir into sev/hudlayout
authorsev <sev.ch@web.de>
Wed, 30 Mar 2011 20:31:39 +0000 (22:31 +0200)
committersev <sev.ch@web.de>
Wed, 30 Mar 2011 20:31:39 +0000 (22:31 +0200)
commit4399325756e6aced160db62e985268a3dd5e4282
tree2d50af57b43adaac0227af003c5979fb57155286
parent71517acc37c758a19401211ebb478707dd19357a
parentc3909bf08b8df2c329af1671ca2e1e800eedeb7f
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir into sev/hudlayout