Skip to content
Snippets Groups Projects
Commit 06fc1c5e authored by James R.'s avatar James R.
Browse files

Merge branch 'penalty-of-death' into 'next' 

I am going to die :D (closes #337)

Closes #337

See merge request STJr/SRB2!1183
parents da41c5b7 25b0290e
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 3 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