From: Dale Weiler <killfieldengine@gmail.com>
Date: Mon, 19 Nov 2012 02:13:46 +0000 (+0000)
Subject: Merge branch 'master' into test-suite
X-Git-Tag: 0.1.9~404
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=commitdiff_plain;h=61fa54318c3aa1ce0c2099f9793d830e5896c016

Merge branch 'master' into test-suite

Conflicts:
	Makefile
	ir.c
---

61fa54318c3aa1ce0c2099f9793d830e5896c016
diff --cc Makefile
index 89168d7,ad8c941..aa5ef11
--- a/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