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, 18 Oct 2013 01:30:17 +0000 (21:30 -0400)
committer	Dale Weiler <killfieldengine@gmail.com>
	Fri, 18 Oct 2013 01:30:17 +0000 (21:30 -0400)
commit	d9e18f0c7322902f1c22bea3aca2b4d5ced3ae2d
tree	cbb91227d7a303a92dee9803b7a6de187dd574b4	tree \| snapshot
parent	d845b8b57276126e34ee380e9602baabdbe22b58	commit \| diff
parent	0cfc275f8200ff0d126a597dfab315828a3fb9af	commit \| diff

Merge branch 'master' into threading

Conflicts:
gmqcc.h
include.mk
parser.c