Merge branch 'master' into next (ad6535ca) · 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

ad6535ca

Commit ad6535ca authored 10 years ago by Eidolon

Downloads
- Plain Diff

Merge branch 'master' into next

Synchronizing STJr/SRB2!3

parents 65139547 2f52a5d3

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 10 additions, 5 deletions

CMakeLists.txt
assets/CMakeLists.txt 1 addition, 1 deletion

assets/CMakeLists.txt
cmake/Modules/GitUtilities.cmake 12 additions, 3 deletions

cmake/Modules/GitUtilities.cmake
src/CMakeLists.txt 120 additions, 100 deletions

src/CMakeLists.txt
src/config.h.in 8 additions, 0 deletions

src/config.h.in
src/sdl/CMakeLists.txt 40 additions, 49 deletions

src/sdl/CMakeLists.txt
src/win32/CMakeLists.txt 17 additions, 10 deletions

src/win32/CMakeLists.txt

with 208 additions and 168 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