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

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

projects / xonotic / darkplaces.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: aef53cd 1f7645e)

author	Cloudwalk <cloudwalk009@gmail.com>
	Mon, 31 May 2021 19:37:15 +0000 (15:37 -0400)
committer	Cloudwalk <cloudwalk009@gmail.com>
	Mon, 31 May 2021 19:37:15 +0000 (15:37 -0400)
commit	db26dc984eaec19233ac4cf451ab06f466f21299
tree	a47dc0b4b48dc4da4c84afeefb6e2a4767db48f9	tree \| snapshot
parent	aef53cdfb295aa32c446abc4c7b5cb693e5b6030	commit \| diff
parent	1f7645e73c1f099c486c716dbd21dda6d55297ea	commit \| diff

Merge branch 'master' into doombringer

23 files changed:

.gitignore	diff1 \|	diff2 \|	blob \| history
cl_demo.c	diff1 \|	diff2 \|	blob \| history
cl_input.c	diff1 \|	diff2 \|	blob \| history
cl_parse.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
common.h	diff1 \|	diff2 \|	blob \| history
csprogs.c	diff1 \|	diff2 \|	blob \| history
fs.c	diff1 \|	diff2 \|	blob \| history
fs.h	diff1 \|	diff2 \|	blob \| history
makefile.inc	diff1 \|	diff2 \|	blob \| history
mvm_cmds.c	diff1 \|	diff2 \|	blob \| history
netconn.c	diff1 \|	diff2 \|	blob \| history
protocol.h	diff1 \|	diff2 \|	blob \| history
prvm_cmds.c	diff1 \|	diff2 \|	blob \| history
prvm_cmds.h	diff1 \|	diff2 \|	blob \| history
server.h	diff1 \|	diff2 \|	blob \| history
snd_main.c	diff1 \|	diff2 \|	blob \| history
sv_ccmds.c	diff1 \|	diff2 \|	blob \| history
sv_save.c	diff1 \|	diff2 \|	blob \| history
sv_user.c	diff1 \|	diff2 \|	blob \| history
svvm_cmds.c	diff1 \|	diff2 \|	blob \| history