Skip to content
Snippets Groups Projects
Commit 58a070ca authored by Lach's avatar Lach
Browse files

Merge branch 'no-fire-shield-palflash' into 'next' 

No fire shield palflash (resolves #512)

Closes #512

See merge request STJr/SRB2!1473
parents ecd59fea e510e716
No related branches found
No related tags found
1 merge request!1473No fire shield palflash (resolves #512)
Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 5 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