Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into charabilities_mk3 (76b56a02) · 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

76b56a02

Commit 76b56a02 authored 8 years ago by toaster

Downloads
- Plain Diff

Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into charabilities_mk3

# Conflicts:
#	src/p_user.c

parents d5575669 c4984bec

No related branches found

No related tags found

Loading

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

.circleci/config.yml 63 additions, 0 deletions

.circleci/config.yml
README.md 1 addition, 0 deletions

README.md
src/dehacked.c 8 additions, 1 deletion

src/dehacked.c
src/g_game.c 0 additions, 10 deletions

src/g_game.c
src/g_input.c 10 additions, 13 deletions

src/g_input.c
src/m_cond.c 37 additions, 1 deletion

src/m_cond.c
src/m_cond.h 7 additions, 0 deletions

src/m_cond.h
src/m_menu.c 2 additions, 0 deletions

src/m_menu.c
src/m_misc.c 1 addition, 1 deletion

src/m_misc.c
src/p_setup.c 11 additions, 11 deletions

src/p_setup.c
src/p_user.c 13 additions, 11 deletions

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

src/r_bsp.c
src/y_inter.c 9 additions, 1 deletion

src/y_inter.c

with 163 additions and 50 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