commit 7311827fcff4ead8930f51c37dff9c0a01bff6e5
Merge: e7abef98 cdc62c17
Author:     Fabian Greffrath <fabian@greffrath.com>
AuthorDate: Thu Dec 18 11:01:04 2014 +0100
Commit:     Fabian Greffrath <fabian@greffrath.com>
CommitDate: Thu Dec 18 11:01:04 2014 +0100

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

 src/strife/d_englsh.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)