Skip to content
Snippets Groups Projects
Commit 5fe2f492 authored by Sal's avatar Sal
Browse files

Merge remote-tracking branch 'refs/remotes/srb2public/next' into zarrotsu 

# Conflicts:
#	src/doomdef.h
#	src/sdl/i_main.c
#	src/sdl/i_video.c
#	src/y_inter.c
parents 727d55b6 96c014de
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 118 additions and 23 deletions
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