commit 1821d8bdd335307de1455ad4342c58ad4841b123
Merge: 9d814494 7d51bb22
Author:     Fabian Greffrath <fabian@greffrath.com>
AuthorDate: Mon Aug 24 19:16:53 2015 +0200
Commit:     Fabian Greffrath <fabian@greffrath.com>
CommitDate: Mon Aug 24 19:16:53 2015 +0200

    Merge branch 'master' of https://github.com/chocolate-doom/chocolate-doom

 man/Makefile.am      |   1 +
 man/doom.template    |   2 +
 man/environ.man      |   5 +-
 man/heretic.template |   2 +
 man/hexen.template   |   2 +
 man/iwad_paths.man   |  48 +++++++++++++++++++
 man/strife.template  |   2 +
 src/d_iwad.c         | 128 +++++++++++++++++++++++++++++++++------------------
 8 files changed, 140 insertions(+), 50 deletions(-)