Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into bustables_misc (2ae07bdf) · Commits · AJ Martinez / SRB2 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Model experiments

Snippets Groups Projects

2ae07bdf

Commit 2ae07bdf authored 5 years ago by toaster

Downloads
- Plain Diff

Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into bustables_misc

# Conflicts:
#	src/p_user.c

parents 5dc095a4 b77780e1

No related branches found

No related tags found

Loading

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

src/dehacked.c 12 additions, 6 deletions

src/dehacked.c
src/info.c 123 additions, 13 deletions

src/info.c
src/info.h 12 additions, 6 deletions

src/info.h
src/m_menu.c 21 additions, 7 deletions

src/m_menu.c
src/p_mobj.c 9 additions, 8 deletions

src/p_mobj.c
src/p_saveg.c 1 addition, 1 deletion

src/p_saveg.c
src/p_user.c 2 additions, 2 deletions

src/p_user.c
src/r_things.c 5 additions, 1 deletion

src/r_things.c
src/s_sound.c 3 additions, 1 deletion

src/s_sound.c
src/sdl/Srb2SDL-vc10.vcxproj 2 additions, 0 deletions

src/sdl/Srb2SDL-vc10.vcxproj
src/sdl/Srb2SDL-vc10.vcxproj.filters 7 additions, 0 deletions

src/sdl/Srb2SDL-vc10.vcxproj.filters
src/sdl/mixer_sound.c 1 addition, 1 deletion

src/sdl/mixer_sound.c
src/win32/Srb2win-vc10.vcxproj 2 additions, 0 deletions

src/win32/Srb2win-vc10.vcxproj
src/win32/Srb2win-vc10.vcxproj.filters 8 additions, 0 deletions

src/win32/Srb2win-vc10.vcxproj.filters

with 208 additions and 46 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment