Skip to content
Snippets Groups Projects
Commit ab769034 authored by Nev3r's avatar Nev3r
Browse files

Merge branch 'udmf-thingargs' into udmf-multitag 

# Conflicts:
#	src/doomdata.h
#	src/lua_mobjlib.c
#	src/p_setup.c
parents de3ad9bc 1afb0eb7
No related branches found
No related tags found
1 merge request!1097UDMF: Multitag support
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