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

Merge branch 'elementalgoop' into 'master' 

THZ goop and Elemental (Resolve #260, I hope?)

Closes #260

See merge request STJr/SRB2Internal!419
parents 049e599f 2439b2cb
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 2 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