Skip to content
Snippets Groups Projects
Commit 0d2d7a28 authored by MascaraSnake's avatar MascaraSnake
Browse files

Merge branch 'udmf-more-linedef-types' into udmf-sector-fields 

# Conflicts:
#	src/p_spec.c
parents 9b780f41 5873ecfa
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 2 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