Merge branch 'master' of git://de.git.xonotic.org/xonotic/netradiant
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 17 Oct 2011 04:47:47 +0000 (06:47 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 17 Oct 2011 04:47:47 +0000 (06:47 +0200)
1  2 
tools/quake3/q3map2/q3map2.h

Simple merge