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

a01a0a3d

Commit a01a0a3d authored 6 years ago by Monster Iestyn

Downloads
- Plain Diff

Merge branch 'master' into next

parents 67874180 9ef98471

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

.circleci/config.yml 6 additions, 3 deletions

.circleci/config.yml
.travis.yml 14 additions, 5 deletions

.travis.yml
src/f_finale.c 21 additions, 3 deletions

src/f_finale.c
src/p_inter.c 1 addition, 1 deletion

src/p_inter.c
src/r_segs.c 21 additions, 18 deletions

src/r_segs.c

with 63 additions and 30 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