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

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

author	Dale Weiler <weilercdale@gmail.com>
	Sun, 25 May 2014 07:01:47 +0000 (03:01 -0400)
committer	Dale Weiler <weilercdale@gmail.com>
	Sun, 25 May 2014 07:01:47 +0000 (03:01 -0400)
commit	53e9ed0d9638b911d377df28505f09c0bee62a35
tree	792367328619fdfdb32e777f141804bd567648bb	tree \| snapshot
parent	05b349c72f622292703f301c410704c2320382f4	commit \| diff
parent	463426ad47b15c9ae6ac38df0fc308477e3b2ccf	commit \| diff

Merge branch 'arithmetic_exceptions' into cooking

Conflicts:
doc/gmqcc.1
gmqcc.ini.example
opts.def
parser.c