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

5a170b9e

Commit 5a170b9e authored 6 years ago by SteelT

Downloads
- Plain Diff

Merge branch 'master' into errorifpng

parents 15323328 cd39b951

Branches

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

.circleci/config.yml 1 addition, 1 deletion

.circleci/config.yml
.travis.yml 7 additions, 2 deletions

.travis.yml
src/Makefile.cfg 8 additions, 6 deletions

src/Makefile.cfg
src/d_clisrv.c 2 additions, 0 deletions

src/d_clisrv.c
src/w_wad.c 4 additions, 0 deletions

src/w_wad.c

with 22 additions and 9 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