Merge remote-tracking branch 'public-gitlab/master' into 21-deb (e4ce0ab9) · 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

e4ce0ab9

Commit e4ce0ab9 authored 6 years ago by Marco Z

Downloads
- Plain Diff

Merge remote-tracking branch 'public-gitlab/master' into 21-deb

parents 5599fe61 776e9208

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

.travis.yml 2 additions, 2 deletions

.travis.yml
src/Makefile.cfg 12 additions, 3 deletions

src/Makefile.cfg
src/d_netcmd.c 4 additions, 1 deletion

src/d_netcmd.c
src/hardware/hw_bsp.c 2 additions, 0 deletions

src/hardware/hw_bsp.c
src/hardware/hw_glob.h 3 additions, 0 deletions

src/hardware/hw_glob.h
src/hardware/hw_main.c 38 additions, 8 deletions

src/hardware/hw_main.c
src/r_segs.c 76 additions, 9 deletions

src/r_segs.c

with 137 additions and 23 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