[quakespasm] 02/06: Merge tag 'upstream/0.92.1+dfsg'

[Stephen Kitt]

This is an automated email from the git hooks/post-receive script.

skitt pushed a commit to branch master
in repository quakespasm.

commit 624554df2db21213584046beff85281e4d81c335
Merge: 3c85fca 1444155
Author: Stephen Kitt <steve at sk2.org>
Date:   Fri Aug 26 22:28:02 2016 +0200

    Merge tag 'upstream/0.92.1+dfsg'
    
    Upstream version 0.92.1+dfsg

 Linux/sgml/Quakespasm.sgml |  10 ++-
 Quake/arch_def.h           |  11 ++-
 Quake/filenames.h          | 194 +++++++++++++++++++++++++++++++++++++++++++++
 Quake/gl_draw.c            |   3 +-
 Quake/keys.h               |   2 +-
 Quake/net_sys.h            |   2 +-
 Quake/q_ctype.h            |  20 ++++-
 Quake/quakedef.h           |   2 +-
 Quake/snd_mikmod.c         |   1 -
 Quakespasm.html            |  67 +++++++++-------
 Quakespasm.txt             | 102 +++++++++++++-----------
 11 files changed, 330 insertions(+), 84 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/quakespasm.git