Skip to content
Snippets Groups Projects
Commit 8ae551e6 authored by toaster's avatar toaster
Browse files

Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart-Public into internal16fixes 

# Conflicts:
#	src/p_tick.c
parents 21bfb975 65737cd4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 1 deletion
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment