commit 8b1522fc1438ccaa19ee90b875f0488f05e09e8c
Merge: 0cb9b40b 5d6ac0a7
Author:     linguica <github@andrewstine.org>
AuthorDate: Fri Sep 11 17:07:44 2015 -0700
Commit:     linguica <github@andrewstine.org>
CommitDate: Fri Sep 11 17:07:44 2015 -0700

    Merge remote-tracking branch 'chocolate-doom/master'

 NEWS                    | 42 ++++++++++++++++++++++++++++++++++++++++++
 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/gusconf.c           |  1 +
 src/setup/mode.c        |  3 +++
 9 files changed, 66 insertions(+), 20 deletions(-)