Skip to content
Snippets Groups Projects
Commit dbd1e61e authored by bitten2up's avatar bitten2up
Browse files

Merge branch 'master' of https://git.do.srb2.org/stjr/srb2 

	modified:   src/CMakeLists.txt
	modified:   src/Makefile
	modified:   src/Makefile.d/detect.mk
	modified:   src/r_picformats.h
	modified:   src/sdl/mixer_sound.c
parents 15b7221c a822de5f
No related branches found
No related tags found
2 merge requests!1657merge master into next,!1595Fix Debian (.deb) build from making (Project_root)/bin/Linux
Hide whitespace changes
Inline Side-by-side
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