From: Mircea Kitsune Date: Tue, 25 Jan 2011 15:31:48 +0000 (+0200) Subject: Merge branch 'master' into mirceakitsune/universal_reload_system X-Git-Tag: xonotic-v0.5.0~309^2~7^2~81 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bcab32df965a80b27c814c0c30b625082584171a;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into mirceakitsune/universal_reload_system --- bcab32df965a80b27c814c0c30b625082584171a