commit 665e472b460274c6109b6e51e586fef04aa34bf2
Merge: cb4848b8 b393641f
Author:     Fabian Greffrath <fabian@greffrath.com>
AuthorDate: Sun Nov 1 18:34:25 2015 +0100
Commit:     Fabian Greffrath <fabian@greffrath.com>
CommitDate: Sun Nov 1 18:34:25 2015 +0100

    Merge pull request #634 from chocolate-doom/diskicon

    Diskicon

 src/Makefile.am     |   1 +
 src/doom/d_main.c   |   5 +-
 src/i_video.c       | 147 ++++------------------------------------------------
 src/i_video.h       |   3 +-
 src/strife/d_main.c |   5 +-
 src/v_diskicon.c    |  61 ++++++++++++++++++++++
 src/v_diskicon.h    |  39 ++++++++++++++
 src/w_wad.c         |   5 +-
 8 files changed, 120 insertions(+), 146 deletions(-)