Merge branch 'master' into blub/parser

author Wolfgang (Blub) Bumiller <blub@speed.at>

Mon, 13 Aug 2012 13:25:40 +0000 (15:25 +0200)

committer Wolfgang (Blub) Bumiller <blub@speed.at>

Mon, 13 Aug 2012 13:25:40 +0000 (15:25 +0200)
author Wolfgang (Blub) Bumiller <blub@speed.at>
Mon, 13 Aug 2012 13:25:40 +0000 (15:25 +0200)
committer Wolfgang (Blub) Bumiller <blub@speed.at>
Mon, 13 Aug 2012 13:25:40 +0000 (15:25 +0200)
diff --cc gmqcc.h
Simple merge
diff --cc ir.c
Simple merge
author	Wolfgang (Blub) Bumiller <blub@speed.at>
	Mon, 13 Aug 2012 13:25:40 +0000 (15:25 +0200)
committer	Wolfgang (Blub) Bumiller <blub@speed.at>
	Mon, 13 Aug 2012 13:25:40 +0000 (15:25 +0200)
		1	2
gmqcc.h	patch \|	diff1 \|	diff2 \|	blob \| history
ir.c	patch \|	diff1 \|	diff2 \|	blob \| history