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 16:28:57 +0000 (16:28 +0000)
committer	Dale Weiler <killfieldengine@gmail.com>
	Fri, 26 Jul 2013 16:28:57 +0000 (16:28 +0000)
commit	a6d1d4bd18323430ffc00ef6b9b579a7401c152a
tree	41583f833dd78581638b13c7aadf2b63b71d7d3b	tree \| snapshot
parent	1fb3e2f9160b0a91929b553b2584555afadcc564	commit \| diff
parent	51eb94f2510aba8bd3a5318750eb9fa7244932e2	commit \| diff

Merge branch 'master' into diagnostics

Conflicts:
gmqcc.h
parser.c