Skip to content
Snippets Groups Projects
Commit bb92986a authored by Inuyasha's avatar Inuyasha
Browse files

Merge branch 'console-improvements' of http://git.magicalgirl.moe/STJr/SRB2... 

Merge branch 'console-improvements' of http://git.magicalgirl.moe/STJr/SRB2 into console-improvements

# Conflicts:
#	src/sdl/i_system.c
parents e245cdfc 1f6388a2
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition 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