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

Merge branch 'public_next' 

# Conflicts:
#	src/doomdef.h
#	src/hardware/hw_draw.c
#	src/m_misc.c
#	src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
parents 3ceaae95 bfa73252
Branches
Tags
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 604 additions and 108 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment