src/sdl/Srb2SDL.props · a038315a5376461f59a1f363c2f9450850360713 · SteelT / SRB2

Forked from STJr / SRB2

Source project has a limited visibility.

5 years ago

Merge branch 'public-musicplus-libopenmpt' of... · 58bb05be

SteelT authored 5 years ago

Merge branch 'public-musicplus-libopenmpt' of https://git.magicalgirl.moe/STJr/SRB2 into public_libopenmpt

# Conflicts:
#	.travis.yml
#	src/m_menu.c
#	src/sdl/Srb2SDL-vc10.vcxproj
#	src/sdl/Srb2SDL.props

58bb05be

History

Merge branch 'public-musicplus-libopenmpt' of...

SteelT authored 5 years ago

Merge branch 'public-musicplus-libopenmpt' of https://git.magicalgirl.moe/STJr/SRB2 into public_libopenmpt

# Conflicts:
#	.travis.yml
#	src/m_menu.c
#	src/sdl/Srb2SDL-vc10.vcxproj
#	src/sdl/Srb2SDL.props