[quakespasm] 02/06: Merge tag 'upstream/0.91.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 dabdc828736642552a6b0903314a093c8525d97e
Merge: 02c5f44 ad3a795
Author: Stephen Kitt <steve at sk2.org>
Date:   Wed Jan 20 11:29:45 2016 +0100

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

 Linux/sgml/Quakespasm.sgml           |  52 +++++++-
 Misc/fs_search_order.patch           |  14 +--
 Misc/quake_retexturing_project.patch |  29 ++---
 Quake/cmd.c                          |  13 +-
 Quake/common.c                       |   2 +-
 Quake/console.c                      |   2 +-
 Quake/gl_fog.c                       |  12 ++
 Quake/gl_mesh.c                      | 227 ++++++++++++++++++++---------------
 Quake/gl_model.c                     |  13 ++
 Quake/gl_model.h                     |   6 +
 Quake/gl_rmain.c                     |  55 ++++++---
 Quake/gl_rmisc.c                     | 128 +++++++++++++++++++-
 Quake/gl_screen.c                    |   3 +-
 Quake/gl_sky.c                       |  28 ++++-
 Quake/gl_texmgr.c                    |  47 ++++++--
 Quake/gl_texmgr.h                    |   1 +
 Quake/gl_vidsdl.c                    |  36 ++++--
 Quake/glquake.h                      |  13 +-
 Quake/host.c                         |   2 +-
 Quake/main_sdl.c                     |   8 +-
 Quake/menu.c                         |   2 +-
 Quake/pr_cmds.c                      |  11 +-
 Quake/quakedef.h                     |   4 +-
 Quake/r_alias.c                      |  14 +--
 Quake/r_brush.c                      |  17 ++-
 Quake/r_sprite.c                     |   2 +-
 Quake/r_world.c                      |  34 ++++--
 Quake/sbar.c                         |   2 +-
 Quake/snd_dma.c                      |   2 +-
 Quake/snd_mp3.c                      |  49 +++++---
 Quake/sys_sdl_win.c                  |   4 +-
 Quake/zone.c                         |   9 +-
 Quakespasm.html                      | 116 +++++++++++++-----
 Quakespasm.txt                       | 146 ++++++++++++++++------
 34 files changed, 803 insertions(+), 300 deletions(-)

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