Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2.git into sonicitems (08a23d7b) · Commits · X.organic / Kart-Public · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

Kart-Public
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Incidents

Snippets Groups Projects

08a23d7b

Commit 08a23d7b authored 6 years ago by toaster

Downloads
- Plain Diff

Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2.git into sonicitems

# Conflicts:
#	src/g_game.c
#	src/v_video.c

parents 7b31d7a9 d5ab3e75

No related branches found

No related tags found

Loading

Changes 15

Expand all Hide whitespace changes

Inline Side-by-side

Showing

.travis.yml 0 additions, 43 deletions

.travis.yml
src/android/i_cdmus.c 1 addition, 1 deletion

src/android/i_cdmus.c
src/djgppdos/i_cdmus.c 1 addition, 1 deletion

src/djgppdos/i_cdmus.c
src/r_data.c 11 additions, 11 deletions

src/r_data.c
src/r_plane.c 13 additions, 2 deletions

src/r_plane.c
src/r_things.c 2 additions, 2 deletions

src/r_things.c
src/s_sound.c 1 addition, 1 deletion

src/s_sound.c
src/sdl/IMG_xpm.c 1052 additions, 360 deletions

src/sdl/IMG_xpm.c
src/sdl/SDL_icon.xpm 206 additions, 418 deletions

src/sdl/SDL_icon.xpm
src/sdl/i_video.c 4 additions, 0 deletions

src/sdl/i_video.c
src/sdl/mixer_sound.c 3 additions, 3 deletions

src/sdl/mixer_sound.c
src/sdl12/i_cdmus.c 1 addition, 1 deletion

src/sdl12/i_cdmus.c
src/v_video.c 26 additions, 21 deletions

src/v_video.c
src/win32/win_cd.c 1 addition, 1 deletion

src/win32/win_cd.c
src/win32ce/win_cd.c 1 addition, 1 deletion

src/win32ce/win_cd.c

with 1323 additions and 866 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