commit 310ad72c180f321c8069f9b3908069537e62d3a1
Merge: 7d8a9f3f 4ffeb43f
Author:     Fabian Greffrath <fabian@greffrath.com>
AuthorDate: Wed May 27 19:35:29 2015 +0200
Commit:     Fabian Greffrath <fabian@greffrath.com>
CommitDate: Wed May 27 19:35:29 2015 +0200

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

 src/sha1.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)