Merge branch 'hotfix-pltz' into 'master'

Browse source

Hotfix pltz

This is the sister merge request of http://git.magicalgirl.moe/STJr/SRB2/merge_requests/14 updated to be compatible with Internal/master's conflicting changes.

See merge request !3

...

This commit is contained in:

Alam Ed Arias 2015-06-18 10:58:43 -04:00

parent fb5cba78d3 e57e75027e

commit c688e4d6d5

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available