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

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

author	Dale Weiler <killfieldengine@gmail.com>
	Sun, 18 Aug 2013 00:11:28 +0000 (00:11 +0000)
committer	Dale Weiler <killfieldengine@gmail.com>
	Sun, 18 Aug 2013 00:11:28 +0000 (00:11 +0000)
commit	d845b8b57276126e34ee380e9602baabdbe22b58
tree	7ab40770a2a1d3ac1ced24254a3d6a946b5054fa	tree \| snapshot
parent	40a130ffeac61049475737d952015137cd1a2b88	commit \| diff
parent	78a3c5d571ecb4fd07b2222f9d3017b289c707bc	commit \| diff

Merge branch 'cooking' into threading

Conflicts:
Makefile
include.mk
parser.c