Merge remote-tracking branch 'remotes/upstream/next' into join-passwords (426f4192) · Commits · brokenspleentec / 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

426f4192

Commit 426f4192 authored 6 years ago by fickleheart

Downloads
- Plain Diff

Merge remote-tracking branch 'remotes/upstream/next' into join-passwords

parents ce815044 8bed922a

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

.travis.yml 7 additions, 2 deletions

.travis.yml
src/Makefile.cfg 4 additions, 0 deletions

src/Makefile.cfg
src/d_netcmd.c 1 addition, 1 deletion

src/d_netcmd.c
src/k_kart.c 3 additions, 14 deletions

src/k_kart.c
src/p_inter.c 3 additions, 0 deletions

src/p_inter.c
src/p_user.c 3 additions, 1 deletion

src/p_user.c

with 21 additions and 18 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