foxygit / doom Log in 
commit d0bb59a02c17dddef40f8f84364792aaf9c75771
Merge: ad816c1b e1f905cd
Author:     Fabian Greffrath <fabian@greffrath.com>
AuthorDate: Tue Jan 20 06:58:34 2015 +0100
Commit:     Fabian Greffrath <fabian@greffrath.com>
CommitDate: Tue Jan 20 06:58:34 2015 +0100

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

 PHILOSOPHY           | 32 ++++++++++++++++++++++++--------
 codeblocks/doom.cbp  |  3 +++
 src/doom/g_game.c    | 13 +++++++------
 src/heretic/g_game.c | 11 ++++++-----
 src/hexen/g_game.c   | 12 ++++++++----
 src/strife/g_game.c  | 11 ++++++-----
 6 files changed, 54 insertions(+), 28 deletions(-)