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

Merge branch 'gtr-replace' into 'next' 

Separate PvP damage from ringslinger

See merge request STJr/SRB2!831
parents b8d40a57 761ec3b6
No related branches found
No related tags found
2 merge requests!985Shaders next merge,!831Separate PvP damage from ringslinger
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment