Merge branch 'master' of git://git.xonotic.org/xonotic/netradiant
authorRudolf Polzer <divVerent@xonotic.org>
Sun, 15 May 2011 20:28:13 +0000 (22:28 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Sun, 15 May 2011 20:28:13 +0000 (22:28 +0200)
Conflicts:
tools/quake3/q3map2/path_init.c


Trivial merge