[quakespasm] 03/06: Merge tag 'upstream/0.90.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 f9797be1fc5ce073101ef1895e8d2b7b74e135c8
Merge: be3679c 4e01d5d
Author: Stephen Kitt <steve at sk2.org>
Date:   Mon Jun 22 07:16:06 2015 +0200

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

 Linux/sgml/Quakespasm.sgml                         |   66 +-
 Misc/qs_pak/Makefile                               |    2 +
 Misc/qs_pak/maps/e1m4.ent                          | 3171 ++++++++++++++++++++
 Misc/qs_pak/maps/e1m4.ent.orig                     | 3169 +++++++++++++++++++
 Misc/qs_pak/maps/e2m2.ent                          | 2005 +++++++++++++
 Misc/qs_pak/maps/e2m2.ent.orig                     | 2004 +++++++++++++
 Misc/qs_pak/maps/e2m3.ent                          |    3 +
 Quake/Makefile.darwin                              |   13 +-
 Quake/Makefile.w32                                 |   30 +-
 Quake/Makefile.w64                                 |   32 +-
 Quake/bgmusic.c                                    |   10 +-
 ...ld_cross_win64.sh => build_cross_win32-sdl2.sh} |    8 +-
 Quake/build_cross_win32.sh                         |    4 +-
 ...ld_cross_win64.sh => build_cross_win64-sdl2.sh} |    4 +-
 Quake/build_cross_win64.sh                         |    4 +-
 Quake/cl_demo.c                                    |    8 +
 Quake/cl_main.c                                    |    9 +-
 Quake/cl_parse.c                                   |   19 +-
 Quake/client.h                                     |    5 +
 Quake/common.c                                     |   32 +-
 Quake/console.c                                    |  128 +-
 Quake/console.h                                    |    1 +
 Quake/gl_fog.c                                     |   23 +-
 Quake/gl_mesh.c                                    |  233 +-
 Quake/gl_model.c                                   |   83 +-
 Quake/gl_model.h                                   |   36 +
 Quake/gl_refrag.c                                  |    2 +-
 Quake/gl_rlight.c                                  |    9 +-
 Quake/gl_rmain.c                                   |  168 +-
 Quake/gl_rmisc.c                                   |  212 +-
 Quake/gl_screen.c                                  |    2 +
 Quake/gl_texmgr.c                                  |   50 +-
 Quake/gl_texmgr.h                                  |    1 +
 Quake/gl_vidsdl.c                                  |  247 +-
 Quake/gl_warp.c                                    |    2 +-
 Quake/glquake.h                                    |   75 +-
 Quake/host.c                                       |    3 +-
 Quake/host_cmd.c                                   |  223 +-
 Quake/net.h                                        |    4 +-
 Quake/net_main.c                                   |    4 +-
 Quake/net_sys.h                                    |    6 +-
 Quake/pr_cmds.c                                    |    4 +-
 Quake/pr_edict.c                                   |    2 +-
 Quake/q_stdinc.h                                   |    8 +-
 Quake/quakedef.h                                   |   15 +-
 Quake/quakespasm.pak                               |  Bin 487121 -> 558328 bytes
 Quake/r_alias.c                                    |  260 +-
 Quake/r_brush.c                                    |   24 +-
 Quake/r_part.c                                     |    4 +
 Quake/r_world.c                                    |   70 +-
 Quake/sbar.c                                       |    3 +-
 Quake/snd_flac.c                                   |   11 +-
 Quake/snd_mem.c                                    |    2 +-
 Quake/snd_mpg123.c                                 |    4 +-
 Quake/snd_sdl.c                                    |    4 +-
 Quake/snd_vorbis.c                                 |    3 +-
 Quake/sv_main.c                                    |    4 +-
 Quake/sys_sdl_unix.c                               |   84 +
 Quake/sys_sdl_win.c                                |   21 +-
 Quakespasm.html                                    |  129 +-
 Quakespasm.txt                                     |  185 +-
 61 files changed, 12503 insertions(+), 444 deletions(-)

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