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)
commit61fa54318c3aa1ce0c2099f9793d830e5896c016
tree82ecef4c837c212851a695f0f6b74708b5b9208b
parent091173341eace2d290f6c0ebc4159c3afca7fbaa
parent19e82883ea29ce43ff45f830bc2c8cfbc8f49007
Merge branch 'master' into test-suite

Conflicts:
Makefile
ir.c
Makefile
gmqcc.h
main.c