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, 2 Jun 2013 08:43:21 +0000 (08:43 +0000)
committer	Dale Weiler <killfieldengine@gmail.com>
	Sun, 2 Jun 2013 08:43:21 +0000 (08:43 +0000)
commit	1fb3e2f9160b0a91929b553b2584555afadcc564
tree	5a5bedff1c801ccfaeb86586b27f181a0a2ec4d6	tree \| snapshot
parent	e9a28d7c0eee7384cf73de5a1792745bb940e4d4	commit \| diff
parent	ee42d2a5701d5bdde900c10065ca8ac520224344	commit \| diff

Merge branch 'cooking' into diagnostics

Conflicts:
Makefile
main.c
opts.def