[quakespasm] 02/03: Merge tag 'upstream/0.93.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 1a2648f6ee831fc483ed7403ccbe2ae7d8287a4e
Merge: d2fd764 9145c6d
Author: Stephen Kitt <steve at sk2.org>
Date:   Thu Nov 23 17:41:27 2017 +0100

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

 Linux/CodeBlocks/QuakeSpasm-SDL2.cbp |    8 +-
 Linux/CodeBlocks/QuakeSpasm.cbp      |    8 +-
 Linux/sgml/Quakespasm.sgml           |   49 +-
 Misc/fs_search_order.patch           |    6 +-
 Misc/mk_header.c                     |    1 +
 Misc/quake_retexturing_project.patch |   12 +-
 Quake/Makefile                       |   18 +-
 Quake/Makefile.darwin                |   27 +-
 Quake/Makefile.w32                   |   22 +-
 Quake/Makefile.w64                   |   20 +-
 Quake/OWMakefile.win32               |  236 ++
 Quake/arch_def.h                     |   14 +-
 Quake/bspfile.h                      |    6 +-
 Quake/cl_input.c                     |    7 +-
 Quake/cl_main.c                      |   37 +-
 Quake/cl_parse.c                     |    6 +-
 Quake/client.h                       |    8 +-
 Quake/cmd.c                          |   61 +-
 Quake/common.c                       |  111 +-
 Quake/common.h                       |   28 +-
 Quake/console.c                      |   20 +-
 Quake/console.h                      |   12 +-
 Quake/crc.c                          |    2 +-
 Quake/crc.h                          |    2 +-
 Quake/filenames.h                    |   15 +-
 Quake/gl_draw.c                      |   14 +-
 Quake/gl_model.c                     |   78 +-
 Quake/gl_model.h                     |    2 +
 Quake/gl_refrag.c                    |  112 +-
 Quake/gl_rmain.c                     |  118 +-
 Quake/gl_rmisc.c                     |    1 +
 Quake/gl_screen.c                    |   60 +-
 Quake/gl_texmgr.c                    |    5 +-
 Quake/gl_vidsdl.c                    |  259 +-
 Quake/gl_warp.c                      |    4 +-
 Quake/glquake.h                      |    5 +
 Quake/host.c                         |   16 +-
 Quake/host_cmd.c                     |  174 +-
 Quake/image.c                        |  136 +-
 Quake/image.h                        |    8 +-
 Quake/in_sdl.c                       |   39 +-
 Quake/lodepng.c                      | 6225 ++++++++++++++++++++++++++++++++++
 Quake/lodepng.h                      | 1762 ++++++++++
 Quake/main_sdl.c                     |    5 +-
 Quake/mathlib.c                      |   15 +-
 Quake/menu.c                         |   49 +-
 Quake/net_defs.h                     |    3 +
 Quake/net_dgrm.c                     |    3 +-
 Quake/net_udp.c                      |   11 +
 Quake/net_wins.c                     |    6 +
 Quake/pl_osx.m                       |    2 +-
 Quake/pr_cmds.c                      |   30 +-
 Quake/pr_edict.c                     |   23 +-
 Quake/pr_exec.c                      |    2 +-
 Quake/progs.h                        |    7 +-
 Quake/q_stdinc.h                     |   56 +-
 Quake/quakedef.h                     |   39 +-
 Quake/r_alias.c                      |   45 +-
 Quake/r_brush.c                      |    2 +-
 Quake/r_part.c                       |    1 +
 Quake/r_world.c                      |  218 +-
 Quake/render.h                       |    3 -
 Quake/sbar.c                         |    6 +-
 Quake/server.h                       |    4 +-
 Quake/snd_codec.c                    |    8 +-
 Quake/snd_flac.c                     |    6 +-
 Quake/snd_mix.c                      |   26 +-
 Quake/snd_modplug.c                  |  121 -
 Quake/snd_modplug.h                  |   12 -
 Quake/snd_sdl.c                      |    2 +-
 Quake/snd_xmp.c                      |  168 +
 Quake/snd_xmp.h                      |   12 +
 Quake/stb_image_write.h              |  684 ++++
 Quake/sv_main.c                      |   23 +-
 Quake/sv_move.c                      |    2 +-
 Quake/sys.h                          |   11 +-
 Quake/sys_sdl_win.c                  |   11 +-
 Quake/vid.h                          |    1 +
 Quake/view.c                         |   33 +
 Quake/wad.c                          |    6 +-
 Quake/world.c                        |  102 +-
 Quakespasm.html                      |  107 +-
 Quakespasm.txt                       |  193 +-
 83 files changed, 10976 insertions(+), 836 deletions(-)

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