Merge branch 'public_next' into private (14ecb240) · 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

14ecb240

Commit 14ecb240 authored 5 years ago by Alam Ed Arias

Downloads
- Plain Diff

Merge branch 'public_next' into private

parents 23f44f48 2d68eac5

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 1 addition, 1 deletion

CMakeLists.txt
assets/CMakeLists.txt 1 addition, 2 deletions

assets/CMakeLists.txt
src/hardware/r_opengl/r_opengl.c 14 additions, 15 deletions

src/hardware/r_opengl/r_opengl.c
src/p_setup.c 2 additions, 2 deletions

src/p_setup.c
src/strcasestr.c 10 additions, 9 deletions

src/strcasestr.c

with 28 additions and 29 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