commit 2170e4e9e6d28d9615afd71fc2a37cf8cc3dd324
Merge: 7510c748 26524bf5
Author:     Fabian Greffrath <fabian@greffrath.com>
AuthorDate: Mon Sep 7 11:40:47 2015 +0200
Commit:     Fabian Greffrath <fabian@greffrath.com>
CommitDate: Mon Sep 7 11:40:47 2015 +0200

    Merge branch 'master' into diskicon

 configure.ac               | 16 ++++++++-
 src/.gitignore             |  1 +
 src/Makefile.am            | 19 +++++++++++
 src/d_iwad.c               | 81 +++++++++++++++++++++++++++++++++-------------
 src/doom.appdata.xml.in    | 45 ++++++++++++++++++++++++++
 src/doomtype.h             |  6 ++++
 src/heretic.appdata.xml.in | 44 +++++++++++++++++++++++++
 src/hexen.appdata.xml.in   | 44 +++++++++++++++++++++++++
 src/strife.appdata.xml.in  | 45 ++++++++++++++++++++++++++
 9 files changed, 277 insertions(+), 24 deletions(-)