git.rm.cloudns.org Git - xonotic/gmqcc.git/commit

]> git.rm.cloudns.org Git - xonotic/gmqcc.git/commit

author	Dale Weiler <killfieldengine@gmail.com>
	Fri, 26 Jul 2013 13:58:45 +0000 (13:58 +0000)
committer	Dale Weiler <killfieldengine@gmail.com>
	Fri, 26 Jul 2013 13:58:45 +0000 (13:58 +0000)
commit	0c7395da1ae45cac8a8a4d6885570b4a44205386
tree	4c7c931becb59cc45a34a25e833b127363e50d20	tree \| snapshot
parent	15a414a1cacaed237efa9df2eea92845de0e2a64	commit \| diff
parent	51eb94f2510aba8bd3a5318750eb9fa7244932e2	commit \| diff

Merge branch 'master' into threading

Conflicts:
Makefile
gmqcc.h
ir.c
ir.h
opts.def
parser.c