commit 3b7f8c554fe6772bab1e6a0b0d341b1a6b5d72b8
Merge: 6aad2f80 ca78a3ab
Author:     Simon Howard <fraggle@soulsphere.org>
AuthorDate: Sun Jan 3 15:29:07 2016 +0100
Commit:     Simon Howard <fraggle@soulsphere.org>
CommitDate: Sun Jan 3 15:29:07 2016 +0100

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

 man/Makefile.am       |  2 +-
 src/Makefile.am       | 11 ++++++-----
 src/setup/Makefile.am |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)