doom · commit

commit 70e39d13808d9a6de004bde9570a2db001cc95e4
Merge: bfda08cf 622653dd
Author:     Fabian Greffrath <fabian@greffrath.com>
AuthorDate: Thu Mar 5 20:52:09 2015 +0100
Commit:     Fabian Greffrath <fabian@greffrath.com>
CommitDate: Thu Mar 5 20:52:09 2015 +0100

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

 HACKING | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)