Merge branch 'master' of ssh://icculus.org/netradiant into icculus
authorRudolf Polzer <divverent@alientrap.org>
Mon, 10 May 2010 16:30:58 +0000 (18:30 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 10 May 2010 16:30:58 +0000 (18:30 +0200)
1  2 
tools/quake3/q3map2/q3map2.h

Simple merge