[openjk] 11/15: Merge tag 'upstream/0_20150815+dfsg1'

[Simon McVittie]

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

smcv pushed a commit to branch master
in repository openjk.

commit 67a772bc819ac759eaf3ea2399d266a21cef71e1
Merge: 4be8381 cae0229
Author: Simon McVittie <smcv at debian.org>
Date:   Sun Aug 16 10:52:45 2015 +0100

    Merge tag 'upstream/0_20150815+dfsg1'
    
    Upstream version 0~20150815+dfsg1

 .travis.yml                                      |  22 +++
 CMakeLists.txt                                   |  18 +-
 CMakeModules/Toolchains/i686-w64-mingw32.cmake   |  18 ++
 CMakeModules/Toolchains/x86_64-w64-mingw32.cmake |  18 ++
 LICENSE.txt                                      |  73 +++++++-
 README.md                                        | 108 +++++-------
 code/CMakeLists.txt                              |   4 +-
 code/Ragl/ragl_common.h                          |   2 +-
 code/cgame/FxScheduler.cpp                       |   4 +-
 code/client/snd_dma.cpp                          |   2 +-
 code/client/snd_local.h                          |   8 +-
 code/game/g_client.cpp                           |   2 -
 code/game/wp_saber.cpp                           | 116 +++++++++---
 code/qcommon/common.cpp                          |   4 +-
 code/qcommon/files.cpp                           |  21 ++-
 code/qcommon/q_shared.h                          |   1 +
 code/qcommon/timing.h                            |   6 +-
 code/rd-vanilla/qgl.h                            |   2 +-
 code/ui/ui_main.cpp                              |  17 +-
 codeJK2/cgame/FxScheduler.cpp                    |   4 +-
 codemp/CMakeLists.txt                            |   4 +-
 codemp/cgame/cg_draw.c                           | 216 ++++++++++++++++++-----
 codemp/client/snd_dma.cpp                        |   2 +-
 codemp/client/snd_local.h                        |   2 +-
 codemp/game/bg_pmove.c                           |   2 +-
 codemp/qcommon/common.cpp                        |   4 +-
 codemp/qcommon/files.cpp                         |  24 ++-
 codemp/rd-vanilla/qgl.h                          |   2 +-
 codemp/rd-vanilla/tr_cmds.cpp                    |  13 +-
 codemp/server/NPCNav/navigator.cpp               |   3 +
 codemp/ui/ui_main.c                              |  23 ++-
 shared/sdl/sdl_input.cpp                         |   2 +-
 shared/sys/con_win32.cpp                         |   2 +-
 shared/sys/sys_win32.cpp                         |   4 +-
 34 files changed, 545 insertions(+), 208 deletions(-)

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