Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into misc_plus_menustuffs (8618d7bb) · Commits · X.organic / Kart-Public · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

Kart-Public
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Incidents

Snippets Groups Projects

8618d7bb

Commit 8618d7bb authored 6 years ago by toaster

Downloads
- Plain Diff

Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into misc_plus_menustuffs

# Conflicts:
#	src/k_kart.c

parents 67d57d82 69cbbde7

No related branches found

No related tags found

No related merge requests found

Changes 11

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/dehacked.c 69 additions, 61 deletions

src/dehacked.c
src/doomdef.h 15 additions, 15 deletions

src/doomdef.h
src/hardware/hw_md2.c 29 additions, 32 deletions

src/hardware/hw_md2.c
src/info.c 76 additions, 41 deletions

src/info.c
src/info.h 16 additions, 7 deletions

src/info.h
src/k_kart.c 286 additions, 154 deletions

src/k_kart.c
src/m_menu.c 3 additions, 4 deletions

src/m_menu.c
src/p_inter.c 0 additions, 1 deletion

src/p_inter.c
src/p_map.c 1 addition, 1 deletion

src/p_map.c
src/p_mobj.c 0 additions, 104 deletions

src/p_mobj.c
src/w_wad.c 6 additions, 1 deletion

src/w_wad.c

with 501 additions and 421 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