From: Mario Date: Sun, 5 Jan 2014 03:55:29 +0000 (+1100) Subject: Merge branch 'Mario/quickmenu_merge' of http://nl.git.xonotic.org/xonotic/xonotic... X-Git-Tag: xonotic-v0.8.2~1987^2~55^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=05fb097d87ea3a4f1f732ae4eb27725ccce9cd43;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'Mario/quickmenu_merge' of http://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir into Mario/quickmenu_merge --- 05fb097d87ea3a4f1f732ae4eb27725ccce9cd43