From: Thomas Debesse <dev@illwieckz.net>
Date: Mon, 11 Feb 2019 06:38:06 +0000 (+0100)
Subject: Merge commit 'f73cc19a6166fc04269f953c980175779f81b9b0' into garux-merge
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e876e8ef487eeb9123f4906373622ffe3b6ea9d4;p=xonotic%2Fnetradiant.git

Merge commit 'f73cc19a6166fc04269f953c980175779f81b9b0' into garux-merge
---

e876e8ef487eeb9123f4906373622ffe3b6ea9d4
diff --cc tools/quake3/q3map2/q3map2.h
index 7f132007,6d2189ce..567777ca
--- a/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 );