Merge branch '2.1.20-preparation' into 'next' (d937f6fc) · Commits · AJ Martinez / SRB2 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Model experiments

Snippets Groups Projects

d937f6fc

Commit d937f6fc authored 7 years ago by Monster Iestyn

Downloads
- Plain Diff

Merge branch '2.1.20-preparation' into 'next'

2.1.20 preparation

See merge request STJr/SRB2!215

parents 5400beb2 ac3fef15

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 1 addition, 1 deletion

CMakeLists.txt
appveyor.yml 1 addition, 1 deletion

appveyor.yml
src/doomdef.h 5 additions, 5 deletions

src/doomdef.h
src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj 2 additions, 2 deletions

src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj
src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj 2 additions, 2 deletions

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

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