[yquake2] 02/11: Merge tag 'upstream/5.31_dfsg1'

[Fabian Greffrath]

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

fabian pushed a commit to branch master
in repository yquake2.

commit 31a8015fdc4abacf399ac3ba8dfed2c8649f69a1
Merge: 0b4ed52 55cac39
Author: Fabian Greffrath <fabian at debian.org>
Date:   Tue Sep 29 09:51:20 2015 +0200

    Merge tag 'upstream/5.31_dfsg1'
    
    Upstream version 5.31~dfsg1

 .gitignore                              |   1 +
 CHANGELOG                               |  13 +-
 CMakeLists.txt                          | 438 ++++++++++++++++++++++++++++++++
 Makefile                                |  23 +-
 README                                  |  29 ++-
 src/backends/sdl/input.c                |  23 +-
 src/backends/sdl/refresh.c              |   4 -
 src/backends/sdl/sound.c                |   4 -
 src/backends/unix/system.c              |   6 +-
 src/client/cl_console.c                 |   4 +-
 src/client/cl_download.c                |   4 +-
 src/client/cl_keyboard.c                |  96 ++++++-
 src/client/cl_main.c                    |   6 +-
 src/client/cl_network.c                 |   2 +-
 src/client/cl_parse.c                   |  11 +-
 src/client/cl_screen.c                  |   2 +-
 src/client/cl_view.c                    |   6 +-
 src/client/header/client.h              |   2 +-
 src/client/header/keyboard.h            |  10 +
 src/client/menu/videomenu.c             |  76 +++++-
 src/client/refresh/r_surf.c             |   1 +
 src/common/cmdparser.c                  |  12 +-
 src/common/filesystem.c                 |   2 +-
 src/common/header/common.h              |   2 +-
 src/common/header/shared.h              |  16 +-
 src/common/movemsg.c                    |   4 +-
 src/common/shared/shared.c              |   5 +-
 src/game/g_main.c                       |   2 +-
 src/game/g_phys.c                       |   4 +-
 src/game/header/game.h                  |   2 -
 src/game/monster/boss3/boss32.c         |   4 +-
 src/game/player/client.c                |   5 +-
 src/game/savegame/savegame.c            |  10 +-
 src/server/sv_init.c                    |   9 +-
 src/server/sv_save.c                    |  15 +-
 stuff/cmake/modules/FindOggVorbis.cmake |  89 +++++++
 stuff/cmake/modules/FindSDL2.cmake      | 173 +++++++++++++
 37 files changed, 1019 insertions(+), 96 deletions(-)

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