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

Merge branch 'next' into kill-zshift 

# Conflicts:
#	src/p_mobj.c
parents 2d90098b 6a85e402
No related branches found
No related tags found
2 merge requests!718Rename R_IsPointInSubsector to R_PointInSubsectorOrNull/Nil,!580Eliminate all unnecessary uses of ZSHIFT
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 8056 additions and 361 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