Merge branch '226-prep' into 'next' (cb13550b) · Commits · SteelT / SRB2 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

cb13550b

Commit cb13550b authored 4 years ago by SteelT

Downloads
- Plain Diff

Merge branch '226-prep' into 'next'

2.2.6 preparation

See merge request STJr/SRB2!1050

parents 3668c37d db6fc75b

Loading

Changes 6

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/config.h.in 3 additions, 2 deletions

src/config.h.in
src/doomdef.h 3 additions, 3 deletions

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

src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj
src/win32/Srb2win.rc 2 additions, 2 deletions

src/win32/Srb2win.rc

with 12 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