From: Rudolf Polzer <divverent@xonotic.org>
Date: Tue, 15 May 2012 09:52:19 +0000 (+0200)
Subject: Merge branch 'master' into divVerent/cutAtDash
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fheads%2FdivVerent%2FcutAtDash;p=xonotic%2Fnetradiant.git

Merge branch 'master' into divVerent/cutAtDash

Conflicts:
	radiant/texwindow.cpp
---

e2362eed53d1b630f844401293e9f2872f09d3a6