Merge commit 'f73cc19a6166fc04269f953c980175779f81b9b0' into garux-merge

diff --cc Makefile
Simple merge

diff --cc radiant/csg.cpp
Simple merge

diff --cc tools/quake3/q3map2/bsp.c
Simple merge

diff --cc tools/quake3/q3map2/map.c
Simple merge

diff --cc tools/quake3/q3map2/model.c
Simple merge

diff --cc tools/quake3/q3map2/q3map2.h
index 7f132007ca33ed057b6f0ba3bd853b7999fdcd3f,6d2189ce82299be40de3b9a12662ef9cba1ec4fe..567777ca8517270d37ea4de827aa08919541a32a
--- 1/tools/quake3/q3map2/q3map2.h
--- 2/tools/quake3/q3map2/q3map2.h
+++ b/tools/quake3/q3map2/q3map2.h
@@@ -2030,11 -2001,9 +2030,9 @@@ Q_EXTERN float jitters[ MAX_JITTERS ]
  
  /*can't code*/
  Q_EXTERN qboolean doingBSP Q_ASSIGN( qfalse );
- Q_EXTERN qboolean doingModelClip Q_ASSIGN( qfalse );
- Q_EXTERN qboolean snapModelClip Q_ASSIGN( qfalse );
  
  /* commandline arguments */
 -Q_EXTERN qboolean                     nocmdline Q_ASSIGN( qfalse );
 +Q_EXTERN qboolean nocmdline Q_ASSIGN( qfalse );
  Q_EXTERN qboolean verbose;
  Q_EXTERN qboolean verboseEntities Q_ASSIGN( qfalse );
  Q_EXTERN qboolean force Q_ASSIGN( qfalse );

diff --cc tools/quake3/q3map2/surface.c
Simple merge