Merge branch 'cooking' of github.com:graphitemaster/gmqcc into cooking

author Dale Weiler <killfieldengine@gmail.com>

Tue, 5 Feb 2013 17:16:09 +0000 (17:16 +0000)

committer Dale Weiler <killfieldengine@gmail.com>

Tue, 5 Feb 2013 17:16:09 +0000 (17:16 +0000)
author Dale Weiler <killfieldengine@gmail.com>
Tue, 5 Feb 2013 17:16:09 +0000 (17:16 +0000)
committer Dale Weiler <killfieldengine@gmail.com>
Tue, 5 Feb 2013 17:16:09 +0000 (17:16 +0000)
diff --cc ast.c
Simple merge
diff --cc parser.c
Simple merge
author	Dale Weiler <killfieldengine@gmail.com>
	Tue, 5 Feb 2013 17:16:09 +0000 (17:16 +0000)
committer	Dale Weiler <killfieldengine@gmail.com>
	Tue, 5 Feb 2013 17:16:09 +0000 (17:16 +0000)
		1	2
ast.c	patch \|	diff1 \|	diff2 \|	blob \| history
parser.c	patch \|	diff1 \|	diff2 \|	blob \| history