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

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

author	David Knapp <cloudwalk009@gmail.com>
	Sun, 27 Sep 2020 01:39:31 +0000 (21:39 -0400)
committer	David Knapp <cloudwalk009@gmail.com>
	Sun, 27 Sep 2020 01:39:31 +0000 (21:39 -0400)
commit	1d63e51f72ca7021b9e032f2b13652d23207d57a
tree	334b5cc55747635a9e11177a6eaf9c1c3b20e2de	tree \| snapshot
parent	ee1f8d5706bb1fbcc93662a951c1f930a2bfd5fb	commit \| diff
parent	e3451fce2f390ba1d8eaac1215709e114d50c663	commit \| diff

Merge branch 'master' into Cloudwalk/protocol_redesign

12 files changed: