Merge branch 'public_next' (7ae6d5ee) · Commits · STJr / SRB2 · GitLab

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

7ae6d5ee

Commit 7ae6d5ee authored 6 years ago by Monster Iestyn

Downloads
- Plain Diff

Merge branch 'public_next'

# Conflicts:
#	src/doomstat.h
#	src/g_game.c

parents 8afaaa80 c9cee397

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

.circleci/config.yml 8 additions, 5 deletions

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

.travis.yml
CMakeLists.txt 9 additions, 3 deletions

CMakeLists.txt
src/f_finale.c 21 additions, 3 deletions

src/f_finale.c
src/i_tcp.c 7 additions, 3 deletions

src/i_tcp.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
src/sdl/i_system.c 14 additions, 2 deletions

src/sdl/i_system.c
src/w_wad.c 32 additions, 0 deletions

src/w_wad.c

with 127 additions and 40 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