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

Merge commit '7ca7a54fe6db387a22ea979e62ecbbb30f6d6d30' into garux-merge
---

4f80165b29510dac0d86a230993a04717143e542
diff --cc tools/quake3/q3map2/q3map2.h
index bf1fee3d,5221bb4f..13496b97
--- a/tools/quake3/q3map2/q3map2.h
+++ b/tools/quake3/q3map2/q3map2.h
@@@ -2028,9 -1999,12 +2028,12 @@@ Q_EXTERN qboolean warnImage Q_ASSIGN( q
  /* ydnar: sinusoid samples */
  Q_EXTERN float jitters[ MAX_JITTERS ];
  
+ /*can't code*/
+ Q_EXTERN qboolean doingBSP 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 );