From: terencehill <piuntn@gmail.com>
Date: Tue, 7 Feb 2012 19:38:09 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/cursormode
X-Git-Tag: xonotic-v0.7.0~196^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3ef447bf0611d1b189f81072db7bbfd988b2f19e;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/cursormode
---

3ef447bf0611d1b189f81072db7bbfd988b2f19e