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

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

projects / xonotic / darkplaces.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b3298e5 bbb80fb)

author	Cloudwalk <cloudwalk009@gmail.com>
	Wed, 26 May 2021 04:32:37 +0000 (00:32 -0400)
committer	Cloudwalk <cloudwalk009@gmail.com>
	Wed, 26 May 2021 04:32:37 +0000 (00:32 -0400)
commit	e0fb2cedfda06a98fd9eb199bb8862a89d7a5eed
tree	44ce90b78452fe6969ea7b6b55cb7fa704c30ac5	tree \| snapshot
parent	b3298e54fff3668ace36b990634c342d65f69ffd	commit \| diff
parent	bbb80fb5e4edbd1a226bdc0e15d6f45efa11c67b	commit \| diff

Merge branch 'master' into Mario/wrath-darkplaces_extra

22 files changed:

cl_input.c	diff1 \|	diff2 \|	blob \| history
cl_parse.c	diff1 \|	diff2 \|	blob \| history
cl_particles.c	diff1 \|	diff2 \|	blob \| history
cl_screen.c	diff1 \|	diff2 \|	blob \| history
client.h	diff1 \|	diff2 \|	blob \| history
clvm_cmds.c	diff1 \|	diff2 \|	blob \| history
cmd.c	diff1 \|	diff2 \|	blob \| history
common.h	diff1 \|	diff2 \|	blob \| history
draw.h	diff1 \|	diff2 \|	blob \| history
fs.c	diff1 \|	diff2 \|	blob \| history
fs.h	diff1 \|	diff2 \|	blob \| history
gl_draw.c	diff1 \|	diff2 \|	blob \| history
gl_rmain.c	diff1 \|	diff2 \|	blob \| history
keys.c	diff1 \|	diff2 \|	blob \| history
makefile.inc	diff1 \|	diff2 \|	blob \| history
menu.c	diff1 \|	diff2 \|	blob \| history
mvm_cmds.c	diff1 \|	diff2 \|	blob \| history
prvm_cmds.c	diff1 \|	diff2 \|	blob \| history
prvm_cmds.h	diff1 \|	diff2 \|	blob \| history
sv_main.c	diff1 \|	diff2 \|	blob \| history
svvm_cmds.c	diff1 \|	diff2 \|	blob \| history
vid_shared.c	diff1 \|	diff2 \|	blob \| history