]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3a09978 2e0468a)
Merge remote branch 'origin/samual/fix_hud_configstuff'
authormand1nga <mand1nga@xonotic.org>
Mon, 11 Apr 2011 00:32:41 +0000 (21:32 -0300)
committermand1nga <mand1nga@xonotic.org>
Mon, 11 Apr 2011 00:32:41 +0000 (21:32 -0300)

Trivial merge