diff options
| author | Simon Howard | 2014-04-26 21:17:53 -0400 |
|---|---|---|
| committer | Simon Howard | 2014-04-26 21:17:53 -0400 |
| commit | 90f7206384d54cee5cee40f3e7c64b7a7c43cb26 (patch) | |
| tree | 1c17c3f5141d447b39a096988d056fd2298eb802 | |
| parent | 3aefe2f23c84f19044ed12264dba4f917d302f80 (diff) | |
| parent | 71936d184819b519c544e9e90ec820cabfb59765 (diff) | |
| download | chocolate-doom-90f7206384d54cee5cee40f3e7c64b7a7c43cb26.tar.gz chocolate-doom-90f7206384d54cee5cee40f3e7c64b7a7c43cb26.tar.bz2 chocolate-doom-90f7206384d54cee5cee40f3e7c64b7a7c43cb26.zip | |
Merge branch 'master' of github.com:chocolate-doom/chocolate-doom
| -rw-r--r-- | man/Makefile.am | 2 | ||||
| -rw-r--r-- | src/i_sdlmusic.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/man/Makefile.am b/man/Makefile.am index ccdc1958..68daf199 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -48,7 +48,7 @@ CLEANFILES = $(GENERATED_MAN_PAGES) $(SETUP_MAN_PAGES) \ $(doomdocs_DATA) $(hereticdocs_DATA) \ $(hexendocs_DATA) $(strifedocs_DATA) -$(SETUP_MAN_PAGES): @PROGRAM_PREFIX@setup.6 +$(SETUP_MAN_PAGES): chocolate-setup.6 cp $< $@ @PROGRAM_PREFIX@doom.6: ../src $(MANPAGE_GEN_FILES) diff --git a/src/i_sdlmusic.c b/src/i_sdlmusic.c index 2a714d3d..4f540e8d 100644 --- a/src/i_sdlmusic.c +++ b/src/i_sdlmusic.c @@ -319,7 +319,7 @@ static void LoadSubstituteConfigs(void) if (!strcmp(configdir, "")) { - musicdir = ""; + musicdir = strdup(""); } else { |