Merge branch 'public_next' (31b9e762) · 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

31b9e762

Commit 31b9e762 authored 8 years ago by Monster Iestyn

Downloads
- Plain Diff

Merge branch 'public_next'

# Conflicts:
#	src/p_mobj.c

parents 541c53c3 1476a4cd

No related branches found

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

README.md 22 additions, 0 deletions

README.md
readme.txt 0 additions, 155 deletions

readme.txt
src/doomdef.h 1 addition, 0 deletions

src/doomdef.h
src/f_finale.c 1 addition, 1 deletion

src/f_finale.c
src/g_game.c 4 additions, 0 deletions

src/g_game.c
src/i_tcp.c 3 additions, 1 deletion

src/i_tcp.c
src/m_menu.c 9 additions, 4 deletions

src/m_menu.c
src/p_map.c 3 additions, 3 deletions

src/p_map.c
src/p_maputl.c 37 additions, 27 deletions

src/p_maputl.c
src/p_maputl.h 1 addition, 1 deletion

src/p_maputl.h
src/p_mobj.c 37 additions, 46 deletions

src/p_mobj.c
src/p_user.c 30 additions, 22 deletions

src/p_user.c
src/st_stuff.c 1 addition, 1 deletion

src/st_stuff.c

with 149 additions and 261 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