Merge remote-tracking branch 'origin/master' into next (fa90ff6b) · 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

fa90ff6b

Commit fa90ff6b authored 4 years ago by James R.

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into next

parents d6b83105 3253ffbb

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 28 additions, 8 deletions

CMakeLists.txt
assets/CMakeLists.txt 21 additions, 11 deletions

assets/CMakeLists.txt
cmake/launch-c.in 3 additions, 0 deletions

cmake/launch-c.in
cmake/launch-cxx.in 3 additions, 0 deletions

cmake/launch-cxx.in
src/CMakeLists.txt 51 additions, 0 deletions

src/CMakeLists.txt
src/sdl/CMakeLists.txt 40 additions, 8 deletions

src/sdl/CMakeLists.txt

with 146 additions and 27 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