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

5c8604ae

Commit 5c8604ae authored 5 years ago by Lactozilla

:speech_balloon:

Downloads
- Plain Diff

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

parents 79daafd8 1771c7c8

No related branches found

No related tags found

2 merge requests!734Rebase Keycodes only branch.,!550Renderer switching

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

.travis.yml 37 additions, 17 deletions

.travis.yml
appveyor.yml 6 additions, 6 deletions

appveyor.yml
assets/CMakeLists.txt 6 additions, 1 deletion

assets/CMakeLists.txt
debian-template/control 2 additions, 0 deletions

debian-template/control
deployer/travis/deployer_defaults.sh 8 additions, 8 deletions

deployer/travis/deployer_defaults.sh
src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj 2 additions, 2 deletions

src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj

with 61 additions and 34 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