From: Rudolf Polzer <divVerent@xonotic.org>
Date: Sun, 15 May 2011 20:28:13 +0000 (+0200)
Subject: Merge branch 'master' of git://git.xonotic.org/xonotic/netradiant
X-Git-Tag: xonotic-v0.5.0~28
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2ceb6c1c5a81cf13f14c52d276bb9b46bcf31f3b;p=xonotic%2Fnetradiant.git

Merge branch 'master' of git://git.xonotic.org/xonotic/netradiant

Conflicts:
	tools/quake3/q3map2/path_init.c
---

2ceb6c1c5a81cf13f14c52d276bb9b46bcf31f3b