]> de.git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
projects / xonotic / gmqcc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a04c0d2 51eb94f)
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 patch | diff1 | diff2 | blob | history
parser.c patch | diff1 | diff2 | blob | history

diff --cc opts.def
index 4e1aa18883075a73eaf631b58b942ebbce266c5a,071b11a951373978388a5f967d4bb65b157408dd..61226ae3719a52d7bbc2dbe3d2890b86322f26bb
--- 1/opts.def
--- 2/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