Merge branch 'cooking' into threading

author Wolfgang Bumiller <wry.git@bumiller.com>

Wed, 17 Apr 2013 16:24:04 +0000 (18:24 +0200)

committer Wolfgang Bumiller <wry.git@bumiller.com>

Wed, 17 Apr 2013 16:24:04 +0000 (18:24 +0200)
author Wolfgang Bumiller <wry.git@bumiller.com>
Wed, 17 Apr 2013 16:24:04 +0000 (18:24 +0200)
committer Wolfgang Bumiller <wry.git@bumiller.com>
Wed, 17 Apr 2013 16:24:04 +0000 (18:24 +0200)
diff --cc gmqcc.h
Simple merge
diff --cc ir.c
Simple merge
diff --cc parser.c
Simple merge
author	Wolfgang Bumiller <wry.git@bumiller.com>
	Wed, 17 Apr 2013 16:24:04 +0000 (18:24 +0200)
committer	Wolfgang Bumiller <wry.git@bumiller.com>
	Wed, 17 Apr 2013 16:24:04 +0000 (18:24 +0200)
		1	2
gmqcc.h	patch \|	diff1 \|	diff2 \|	blob \| history
ir.c	patch \|	diff1 \|	diff2 \|	blob \| history
parser.c	patch \|	diff1 \|	diff2 \|	blob \| history