[openjk] branch upstream updated (7a5c138 -> ece0606)

[Simon McVittie]

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

smcv pushed a change to branch upstream
in repository openjk.

      from  7a5c138   Imported Upstream version 0~20150104+ds1
      adds  ece0606   Imported Upstream version 0~20150204+ds1

No new revisions were added by this update.

Summary of changes:
 CHANGELOG.txt                            |    5 +-
 code/CMakeLists.txt                      |    4 +-
 code/Ratl/ratl.cpp                       |   25 -
 code/Ratl/ratl_common.h                  |    4 -
 code/cgame/cg_consolecmds.cpp            |    1 +
 code/client/cl_cin.cpp                   |    9 +
 code/client/cl_main.cpp                  |    3 +
 code/client/snd_dma.cpp                  |   10 +-
 code/client/snd_public.h                 |    2 +-
 code/game/fields.h                       |    2 +-
 code/game/g_public.h                     |    2 +-
 code/game/g_ref.cpp                      |    2 +
 code/game/wp_saberLoad.cpp               |  113 +--
 code/qcommon/cm_patch.cpp                |    4 +-
 code/qcommon/cmd.cpp                     |   77 +-
 code/qcommon/common.cpp                  |    2 +-
 code/qcommon/{files_pc.cpp => files.cpp} | 1635 ++++++++++++++++++++++++------
 code/qcommon/files.h                     |  130 ---
 code/qcommon/files_common.cpp            |  660 ------------
 code/qcommon/files_console.cpp           | 1029 -------------------
 code/qcommon/qcommon.h                   |   39 +-
 code/rd-common/tr_image_png.cpp          |    2 +-
 code/rd-common/tr_public.h               |    6 +-
 code/rd-vanilla/tr_WorldEffects.cpp      |    2 +-
 code/rd-vanilla/tr_init.cpp              |    5 +-
 code/rd-vanilla/tr_local.h               |    2 +-
 code/rd-vanilla/tr_shade.cpp             |    3 +-
 code/rd-vanilla/tr_shader.cpp            |    2 +-
 code/server/sv_game.cpp                  |  672 +++++++++---
 code/ui/ui_connect.cpp                   |    2 +
 code/ui/ui_debug.cpp                     |  747 --------------
 code/ui/ui_public.h                      |    2 +-
 code/ui/ui_shared.cpp                    |   11 +-
 code/ui/ui_splash.cpp                    |  292 ------
 code/ui/ui_splash.h                      |   11 -
 code/win32/win_main.cpp                  |   92 --
 codeJK2/cgame/cg_consolecmds.cpp         |    1 +
 codeJK2/game/NPC_misc.cpp                |    4 +-
 codeJK2/game/NPC_stats.cpp               |    3 -
 codeJK2/game/Q3_Interface.cpp            |    4 +-
 codeJK2/game/fields.h                    |    4 +-
 codeJK2/game/g_public.h                  |    2 +-
 codeJK2/game/g_ref.cpp                   |    2 +
 codemp/client/FxPrimitives.cpp           |  125 +--
 codemp/client/snd_dma.cpp                |   10 +-
 codemp/client/snd_public.h               |    2 +-
 codemp/game/bg_vehicleLoad.c             |  510 +++++-----
 codemp/game/bg_vehicles.h                |    3 -
 codemp/qcommon/cm_patch.cpp              |    4 +-
 codemp/rd-dedicated/G2_API.cpp           |   26 +-
 codemp/rd-dedicated/tr_shader.cpp        |    2 +-
 codemp/rd-dedicated/tr_skin.cpp          |    2 +-
 codemp/rd-vanilla/G2_API.cpp             |   26 +-
 codemp/rd-vanilla/tr_image.cpp           |    3 +-
 codemp/rd-vanilla/tr_shader.cpp          |  126 ++-
 codemp/rd-vanilla/tr_skin.cpp            |    2 +-
 codemp/server/sv_ccmds.cpp               |    1 +
 codemp/server/sv_main.cpp                |    2 +-
 codemp/ui/ui_main.c                      |  132 ++-
 codemp/ui/ui_shared.c                    |   22 +-
 60 files changed, 2654 insertions(+), 3973 deletions(-)
 rename code/qcommon/{files_pc.cpp => files.cpp} (53%)
 delete mode 100644 code/qcommon/files.h
 delete mode 100644 code/qcommon/files_common.cpp
 delete mode 100644 code/qcommon/files_console.cpp
 delete mode 100644 code/ui/ui_debug.cpp
 delete mode 100644 code/ui/ui_splash.cpp
 delete mode 100644 code/ui/ui_splash.h

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