Merge remote-tracking branch 'origin/master' into png-patches (acc8dae2) · Commits · STJr / SRB2 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry

Snippets Groups Projects

acc8dae2

Commit acc8dae2 authored 5 years ago by Lactozilla

:speech_balloon:

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into png-patches

parents 6c37576b 00d64c38

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

srb2.png 0 additions, 0 deletions

srb2.png
src/sdl/IMG_xpm.c 39 additions, 18 deletions

src/sdl/IMG_xpm.c
src/sdl/SDL_icon.xpm 97 additions, 161 deletions

src/sdl/SDL_icon.xpm
src/sdl/Srb2SDL.ico 0 additions, 0 deletions

src/sdl/Srb2SDL.ico
src/sdl/i_video.c 1 addition, 1 deletion

src/sdl/i_video.c
src/sdl/macosx/Srb2mac.icns 0 additions, 0 deletions

src/sdl/macosx/Srb2mac.icns
src/sdl/srb2icon.png 0 additions, 0 deletions

src/sdl/srb2icon.png
src/win32/Srb2win.ico 0 additions, 0 deletions

src/win32/Srb2win.ico
src/win32/Srb2win.rc 8 additions, 5 deletions

src/win32/Srb2win.rc

with 145 additions and 185 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