commit b3f6b7715c613aa96a7192d8385a6af471b3fc2f
Merge: 9057c76e 9913f4f4
Author:     Fabian Greffrath <fabian@greffrath.com>
AuthorDate: Fri Sep 4 13:33:31 2015 +0200
Commit:     Fabian Greffrath <fabian@greffrath.com>
CommitDate: Fri Sep 4 13:33:31 2015 +0200

    Merge pull request #606 from jmtd/diskicon-strife

    Fix STDISK offset for strife

 src/doom/d_main.c   |  2 +-
 src/i_video.c       | 24 +++++++++++-------------
 src/i_video.h       |  7 ++++++-
 src/strife/d_main.c |  2 +-
 4 files changed, 19 insertions(+), 16 deletions(-)