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

Merge remote-tracking branch 'remotes/pub/next' into next

# Conflicts:
#	src/d_clisrv.c
#	src/d_clisrv.h
#	src/doomdef.h
#	src/p_user.c
parents 1902114a a29ced72
Branches
Tags SRB2_release_2.1.14
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment