Merge branch 'master' into test-suite
authorDale Weiler <killfieldengine@gmail.com>
Mon, 19 Nov 2012 02:13:46 +0000 (02:13 +0000)
committerDale Weiler <killfieldengine@gmail.com>
Mon, 19 Nov 2012 02:13:46 +0000 (02:13 +0000)
Conflicts:
Makefile
ir.c

1  2 
Makefile
gmqcc.h
main.c

diff --cc Makefile
+++ b/Makefile
@@@ -28,9 -28,8 +28,10 @@@ OBJ     =             
            code.o      \
            ast.o       \
            ir.o        \
-           con.o
-           
+           con.o       \
+           ftepp.o
++
 +OBJ_T = test.o util.o con.o
  OBJ_C = main.o lexer.o parser.o
  OBJ_X = exec-standalone.o util.o con.o
  
diff --cc gmqcc.h
Simple merge
diff --cc main.c
Simple merge