# Conflicts:
#	extras/conf/SRB2-22.cfg

# Conflicts:
#	src/p_spec.c

The compiler doesn't like this and will give you a "inlining failed in call to 'P_DoTwinSpin': call is unlikely and code size would grow" error

Restore jump-related pflags properly during twinspin

See merge request !908

Delete polyobjects

See merge request !911

Remove P_FindSectorFromLineTag and P_FindLineFromLineTag

See merge request STJr/SRB2!901

More thinker refactoring

See merge request !900

elevator_t cleanup

See merge request !896

# Conflicts:
#	src/p_saveg.c

Add a minimum delay between connections

See merge request !889

Fix a few strncpy bullshit

See merge request STJr/SRB2!895

Netgame $$$.sav code cleanup

See merge request !894

This reverts commit 2e27f32d.

Fix mouse being grabbed in intermission and cutscenes

See merge request STJr/SRB2!891

Make P_AddRaiseThinker more configurable via function parameters (needed for UDMF)

See merge request STJr/SRB2!899

Clean up the plane thinker cleanup

See merge request !897