[yquake2] 02/04: Merge tag 'upstream/6.00_dfsg1' into debian/master

[Simon McVittie]

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

smcv pushed a commit to branch debian/master
in repository yquake2.

commit 5d8896678eddf795407f7d91e91d809cf92838e7
Merge: 299e6c1 0a5508d
Author: Simon McVittie <smcv at debian.org>
Date:   Tue Dec 13 13:22:00 2016 +0000

    Merge tag 'upstream/6.00_dfsg1' into debian/master
    
    Upstream version 6.00~dfsg1

 CHANGELOG                         |  14 +
 CMakeLists.txt                    |   8 +-
 Makefile                          |  39 ++-
 README.md                         |  13 +-
 src/backends/generic/header/qgl.h |  17 +-
 src/backends/generic/qal.c        | 206 ++++++++-------
 src/backends/generic/qgl.c        |  14 +-
 src/backends/generic/vid.c        |   4 -
 src/backends/sdl/input.c          |   8 +-
 src/backends/sdl/refresh.c        |  36 +++
 src/backends/unix/main.c          |  13 +-
 src/backends/unix/signalhandler.c |  10 +-
 src/backends/unix/system.c        |  22 +-
 src/backends/windows/system.c     |  10 +-
 src/client/cl_cin.c               |   6 +
 src/client/cl_download.c          |   3 +
 src/client/cl_effects.c           |   3 +-
 src/client/cl_input.c             | 166 +++++++++---
 src/client/cl_lights.c            |   2 +-
 src/client/cl_main.c              | 300 +++++++++++++--------
 src/client/cl_prediction.c        |  26 +-
 src/client/cl_screen.c            |  10 +-
 src/client/header/client.h        |   8 +-
 src/client/menu/menu.c            |  47 +---
 src/client/refresh/header/local.h |  43 ++-
 src/client/refresh/r_draw.c       | 337 ++++++++++++++++--------
 src/client/refresh/r_image.c      |  50 ++--
 src/client/refresh/r_light.c      |  48 ++--
 src/client/refresh/r_lightmap.c   |   3 +-
 src/client/refresh/r_main.c       | 531 ++++++++++++++++++++++----------------
 src/client/refresh/r_mesh.c       | 176 +++++--------
 src/client/refresh/r_misc.c       |  12 +-
 src/client/refresh/r_surf.c       | 356 ++++++++++++++-----------
 src/client/refresh/r_warp.c       |  74 ++++--
 src/client/sound/openal.c         |   2 +-
 src/common/cvar.c                 |   1 +
 src/common/filesystem.c           |  62 -----
 src/common/header/common.h        |  15 +-
 src/common/misc.c                 |   2 +-
 src/game/g_ai.c                   |   3 +-
 src/game/g_misc.c                 |   2 +-
 src/game/g_monster.c              |   5 -
 src/game/g_spawn.c                |  16 ++
 src/game/monster/flyer/flyer.c    |   2 +-
 src/game/monster/gunner/gunner.c  |   5 +-
 src/game/savegame/savegame.c      |  38 +--
 stuff/README.old                  |   2 +-
 47 files changed, 1634 insertions(+), 1136 deletions(-)

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