Skip to content
Snippets Groups Projects
Commit 863b1e12 authored by MascaraSnake's avatar MascaraSnake
Browse files

Merge branch 'udmf-lighting' into udmf-linedef-executors 

# Conflicts:
#	src/p_spec.c
parents 4b8f5bd7 2e56c3de
Hide whitespace changes
Inline Side-by-side
Showing
with 261 additions and 176 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