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

Merge branch 'udmf-multitag' into udmf-fofs-mkii and pray 

# Conflicts:
#	src/p_floor.c
#	src/p_spec.c
parents 7dd83285 072e1889
Branches
Tags
10 merge requests!1714UDMF: The whole thing,!1696UDMF: Sector fields,!1694UDMF: More linedef types,!1693UDMF: Thing types,!1680UDMF: Linedef executor triggers,!1621UDMF: Lighting,!1572UDMF: PolyObject actions,!1564UDMF: Scrollers and pushers,!1557UDMF: Plane movers,!915UDMF FOFs
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 457 additions and 478 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment