Skip to content
Snippets Groups Projects
Commit ad01dcc5 authored by wolfs's avatar wolfs
Browse files

Merge remote-tracking branch 'remotes/public/next' into gamepad-tweaks 

# Conflicts:
#	CMakeLists.txt
#	appveyor.yml
#	src/command.c
#	src/command.h
#	src/d_clisrv.c
#	src/d_netcmd.c
#	src/dehacked.c
#	src/doomdef.h
#	src/hu_stuff.c
#	src/m_misc.c
parents 15b0e3ab 78ac0388
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 872 additions and 23 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment