Merge branch '2.2.2-prep' into 'next' (0770f773) · Commits · John Peter Sa / SRB2 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

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

Snippets Groups Projects

0770f773

Commit 0770f773 authored 5 years ago by SteelT

Downloads
- Plain Diff

Merge branch '2.2.2-prep' into 'next'

2.2.2 preparation

See merge request STJr/SRB2!811

parents af12f26f 03e38e94

No related branches found

Tags SRB2_release_2.2.7

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 1 addition, 1 deletion

CMakeLists.txt
appveyor.yml 1 addition, 1 deletion

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

assets/CMakeLists.txt
src/config.h.in 2 additions, 2 deletions

src/config.h.in
src/d_main.c 2 additions, 2 deletions

src/d_main.c
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

with 15 additions and 14 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