Skip to content
Snippets Groups Projects
Commit 95248dc8 authored by MascaraSnake's avatar MascaraSnake
Browse files

Merge branch 'next' into udmf-thing-types 

# Conflicts:
#	src/p_mobj.c
parents 1aa9ba14 31eb2a7e
No related branches found
No related tags found
4 merge requests!1714UDMF: The whole thing,!1696UDMF: Sector fields,!1694UDMF: More linedef types,!1693UDMF: Thing types
Hide whitespace changes
Inline Side-by-side
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