commit c70ac8af1e4c4ec821d4353d09bd16d2350f05bc
Merge: 4cd845c7 679c6753
Author:     Simon Howard <fraggle+github@gmail.com>
AuthorDate: Mon Jan 2 15:12:34 2017 +0100
Commit:     GitHub <noreply@github.com>
CommitDate: Mon Jan 2 15:12:34 2017 +0100

    Merge pull request #749 from nukeykt/retailfix

    strife: Add ASCII intro.

 src/strife/Makefile.am |   4 +-
 src/strife/d_main.c    | 265 ++++++++++++++++++++++++++++++++++++++++---------
 2 files changed, 222 insertions(+), 47 deletions(-)