ref: 90f7206384d54cee5cee40f3e7c64b7a7c43cb26
parent: 3aefe2f23c84f19044ed12264dba4f917d302f80
parent: 71936d184819b519c544e9e90ec820cabfb59765
author: Simon Howard <[email protected]>
date: Sat Apr 26 17:17:53 EDT 2014
Merge branch 'master' of github.com:chocolate-doom/chocolate-doom
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -48,7 +48,7 @@
$(doomdocs_DATA) $(hereticdocs_DATA) \
$(hexendocs_DATA) $(strifedocs_DATA)
-$(SETUP_MAN_PAGES): @[email protected]
+$(SETUP_MAN_PAGES): chocolate-setup.6
cp $< $@
@[email protected]: ../src $(MANPAGE_GEN_FILES)
--- a/src/i_sdlmusic.c
+++ b/src/i_sdlmusic.c
@@ -319,7 +319,7 @@
if (!strcmp(configdir, ""))
{- musicdir = "";
+ musicdir = strdup("");}
else
{