Skip to content
Snippets Groups Projects
Commit 6adfe7a8 authored by sphere's avatar sphere
Browse files

Merge branch 'forceshieldhp' into 'next' 

Show extra Force Shield hits using text instead of stacking more icons

See merge request STJr/SRB2!2378
parents 4faa429f e03b4c3e
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 10 additions and 6 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment