3 commits

Author	SHA1	Message	Date
Edward Richardson	e5c67cee83	Merge branch conflicts fix ... - CONFLICT (content): Merge conflict in src/p_acs.cpp - Updated position variables	2016-01-21 10:49:57 +13:00
Christoph Oelckers	aff42a6186	- don't look up a lump name in PathExpander if we are only looking for real files.	2015-12-30 10:21:17 +01:00
Christoph Oelckers	fe2dcfd588	- refactored the GUS/Timidity player's path building code so that it can also be used by WildMidi. ... - fixed crash during sound reset - in this case I_ShutdownMusic should not close the WildMidi player.	2015-12-29 20:38:08 +01:00