Skip to content
Snippets Groups Projects
Commit 1580e14c authored by MascaraSnake's avatar MascaraSnake
Browse files

Merge branch 'next' into udmf-next 

# Conflicts:
#	extras/conf/Includes/SRB222_linedefs.cfg
#	extras/conf/Includes/SRB222_misc.cfg
#	src/p_spec.c
parents a8f53b31 42445b39
1 merge request!1075Merge udmf-next into next
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 229 additions and 7564 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