[quakespasm] 02/05: Merge tag 'upstream/0.92.0+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 304aa599a52402df54284b72e80af44623c2fba7
Merge: 7adc414 d8ff8e2
Author: Stephen Kitt <steve at sk2.org>
Date:   Mon Jul 25 08:10:38 2016 +0200

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

 Linux/CodeBlocks/QuakeSpasm-SDL2.cbp |   2 +-
 Linux/CodeBlocks/QuakeSpasm.cbp      |   2 +-
 Linux/sgml/Quakespasm.sgml           |  87 ++++++-
 Misc/qs_pak/default.cfg              |   8 +
 Quake/Makefile.w32                   |   6 +-
 Quake/Makefile.w64                   |   6 +-
 Quake/bgmusic.c                      |  10 +
 Quake/bspfile.h                      |   2 +-
 Quake/cl_demo.c                      |   1 +
 Quake/cl_input.c                     |   4 +-
 Quake/cl_main.c                      |   2 +-
 Quake/cl_parse.c                     |  50 ++--
 Quake/cl_tent.c                      |  72 +++---
 Quake/client.h                       |   1 +
 Quake/common.c                       |  48 +++-
 Quake/common.h                       |  12 +-
 Quake/gl_draw.c                      |   6 +-
 Quake/gl_model.c                     |   2 +
 Quake/gl_rlight.c                    |   2 -
 Quake/gl_rmain.c                     |   9 +-
 Quake/gl_screen.c                    |   4 +-
 Quake/gl_texmgr.c                    |  14 +-
 Quake/gl_vidsdl.c                    |  33 ++-
 Quake/gl_warp.c                      |   3 +
 Quake/glquake.h                      |   4 +-
 Quake/host.c                         |   5 +-
 Quake/host_cmd.c                     |  76 +++++-
 Quake/in_sdl.c                       | 439 ++++++++++++++++++++++++++++++++++-
 Quake/input.h                        |   2 +-
 Quake/keys.c                         |  13 +-
 Quake/keys.h                         |  15 +-
 Quake/mathlib.h                      |   1 +
 Quake/menu.c                         |  64 ++++-
 Quake/net_sys.h                      |   2 +-
 Quake/pr_cmds.c                      |  10 +-
 Quake/pr_edict.c                     |   2 +-
 Quake/protocol.h                     |  13 +-
 Quake/quakedef.h                     |   2 +-
 Quake/quakespasm.pak                 | Bin 558328 -> 558584 bytes
 Quake/r_brush.c                      |  16 +-
 Quake/r_part.c                       |   2 +-
 Quake/server.h                       |   1 +
 Quake/sv_main.c                      |  76 ++++--
 Quake/sv_user.c                      |  23 +-
 Quake/sys_sdl_unix.c                 |   1 +
 Quake/sys_sdl_win.c                  |   1 +
 Quake/view.c                         |   2 +-
 Quake/view.h                         |   1 +
 Quake/world.c                        |   6 +-
 Quakespasm.html                      | 140 ++++++++---
 Quakespasm.txt                       | 245 ++++++++++++++-----
 51 files changed, 1263 insertions(+), 285 deletions(-)

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