From: Dale Weiler <killfieldengine@gmail.com>
Date: Mon, 17 Jun 2013 20:14:26 +0000 (+0000)
Subject: Merge branch 'master' into cooking
X-Git-Tag: v0.3.0~105
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=commitdiff_plain;h=e6c1d66c35267392527a5177a82c48737ce9831b

Merge branch 'master' into cooking

Conflicts:
	opts.def
---

e6c1d66c35267392527a5177a82c48737ce9831b
diff --cc opts.def
index 4e1aa18,071b11a..61226ae
--- a/opts.def
+++ b/opts.def
@@@ -90,7 -89,7 +90,8 @@@
      GMQCC_DEFINE_FLAG(DIFFERENT_ATTRIBUTES)
      GMQCC_DEFINE_FLAG(DEPRECATED)
      GMQCC_DEFINE_FLAG(PARENTHESIS)
 +    GMQCC_DEFINE_FLAG(UNSAFE_TYPES)
+     GMQCC_DEFINE_FLAG(BREAKDEF)
  #endif
  
  #ifdef GMQCC_TYPE_OPTIMIZATIONS