Merge branch 'resolve-1256' into 'next' (60a8d91d) · Commits · X.organic / SRB2 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

60a8d91d

Commit 60a8d91d authored 10 months ago by sphere

Downloads
- Plain Diff

Merge branch 'resolve-1256' into 'next'

Resolve #1256

Closes #1256

See merge request STJr/SRB2!2475

parents ce1901a3 a50d7f5d

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/apng.c 1 addition, 1 deletion

src/apng.c
src/d_main.c 1 addition, 1 deletion

src/d_main.c
src/deh_soc.c 1 addition, 1 deletion

src/deh_soc.c
src/filesrch.c 1 addition, 1 deletion

src/filesrch.c
src/sdl/CMakeLists.txt 0 additions, 2 deletions

src/sdl/CMakeLists.txt
src/sdl/i_video.c 1 addition, 1 deletion

src/sdl/i_video.c

with 5 additions and 7 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