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

98b1254a

Commit 98b1254a authored 9 years ago by Alam Ed Arias

Downloads
- Plain Diff

Merge branch 'master' into next

parents 8ceba95b 00813979

Branches

Tags

Loading

Changes 7

Show whitespace changes

Inline Side-by-side

Showing

.travis.yml 1 addition, 1 deletion

.travis.yml
appveyor.yml 1 addition, 1 deletion

appveyor.yml
src/Makefile 1 addition, 1 deletion

src/Makefile
src/Makefile.cfg 3 additions, 0 deletions

src/Makefile.cfg
src/hardware/hw_main.c 6 additions, 4 deletions

src/hardware/hw_main.c
src/hardware/hw_md2.c 1 addition, 4 deletions

src/hardware/hw_md2.c
src/p_saveg.c 2 additions, 2 deletions

src/p_saveg.c

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