commit 98f798dd4b926ff8e97ed0b058c750ba2d5e2b06
Merge: b36170d1 939cbfeb
Author: Simon Howard <fraggle+github@gmail.com>
AuthorDate: Mon Jan 2 15:02:20 2017 +0100
Commit: GitHub <noreply@github.com>
CommitDate: Mon Jan 2 15:02:20 2017 +0100
Merge branch 'master' into commandline-savedir
NEWS.md | 11 +-
codeblocks/config.h | 6 +-
codeblocks/game-res.rc | 10 +-
codeblocks/setup-res.rc | 8 +-
configure.ac | 2 +-
msvc/config.h | 6 +-
msvc/win32.rc | 8 +-
src/heretic/p_enemy.c | 30 ++--
src/hexen/a_action.c | 4 +-
src/hexen/p_enemy.c | 47 +++---
src/hexen/p_mobj.c | 7 +-
src/hexen/p_pspr.c | 8 +-
src/i_oplmusic.c | 378 +++++++++++++++++++++---------------------------
13 files changed, 247 insertions(+), 278 deletions(-)
diff --cc NEWS.md
index 3eb07086,837a808d..ab3180dc
--- a/NEWS.md
+++ b/NEWS.md
@@@ -1,5 -1,5 +1,11 @@@
+## HEAD
+
++### General
++ * A new parameter -savedir allows users to specify a directory from
++ which to load and save games. (thanks CapnClever)
++
+ ## 2.3.0 (2016-12-29)
+
### General
* Bash completion scripts are included (thanks Fabian)
* The OS X launcher now supports the .lmp file format (thanks Jon)