Merge branch 'Mario/wrath-darkplaces' into Mario/wrath-darkplaces_extra

author Cloudwalk <mazecraze96@gmail.com>

Wed, 10 Jun 2020 13:44:49 +0000 (09:44 -0400)

committer Cloudwalk <mazecraze96@gmail.com>

Wed, 10 Jun 2020 13:44:49 +0000 (09:44 -0400)
author Cloudwalk <mazecraze96@gmail.com>
Wed, 10 Jun 2020 13:44:49 +0000 (09:44 -0400)
committer Cloudwalk <mazecraze96@gmail.com>
Wed, 10 Jun 2020 13:44:49 +0000 (09:44 -0400)
diff --cc cl_input.c
Simple merge
diff --cc gl_rmain.c
Simple merge
diff --cc quakedef.h
Simple merge
author	Cloudwalk <mazecraze96@gmail.com>
	Wed, 10 Jun 2020 13:44:49 +0000 (09:44 -0400)
committer	Cloudwalk <mazecraze96@gmail.com>
	Wed, 10 Jun 2020 13:44:49 +0000 (09:44 -0400)
		1	2
cl_input.c	patch \|	diff1 \|	diff2 \|	blob \| history
gl_rmain.c	patch \|	diff1 \|	diff2 \|	blob \| history
quakedef.h	patch \|	diff1 \|	diff2 \|	blob \| history