Merge branch 'master' into cooking
authorDale Weiler <killfieldengine@gmail.com>
Mon, 17 Jun 2013 20:14:26 +0000 (20:14 +0000)
committerDale Weiler <killfieldengine@gmail.com>
Mon, 17 Jun 2013 20:14:26 +0000 (20:14 +0000)
Conflicts:
opts.def

1  2 
opts.def
parser.c

diff --cc 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
diff --cc parser.c
Simple merge