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

Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-fofs-mkii 

# Conflicts:
#	src/p_user.c
parents ad9e3411 713b965a
No related branches found
No related tags found
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 2441 additions and 863 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