Skip to content
Snippets Groups Projects
Commit a3b86a73 authored by Monster Iestyn's avatar Monster Iestyn
Browse files

Merge branch 'public_next' 

# Conflicts:
#	src/f_finale.c
#	src/hardware/hw_draw.c
#	src/hardware/hw_main.c
#	src/hardware/r_opengl/r_opengl.c
#	src/sdl12/hwsym_sdl.c
#	src/sdl12/i_video.c
parents ca8e14d5 cf6a30a8
Branches
Tags
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 983 additions and 579 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment