This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch debian/master in repository openjk.
commit 1d4db1ce726a9bb0bfa4e48e7fd5852c0ac3d720 Merge: dd26951 83d3b79 Author: bibendovsky <bibendov...@hotmail.com> Date: Sat Aug 13 18:35:46 2016 +0300 Merge with latest master CMakeLists.txt | 5 +- code/cgame/cg_ents.cpp | 2 + code/client/cl_input.cpp | 5 -- code/client/cl_main.cpp | 2 +- code/client/snd_music.cpp | 33 ++++---- code/game/g_client.cpp | 7 +- code/game/genericparser2.h | 1 - code/game/wp_melee.cpp | 4 + code/qcommon/cm_load.cpp | 40 +++------ code/qcommon/cm_local.h | 4 +- code/qcommon/common.cpp | 2 + code/qcommon/q_shared.cpp | 123 ---------------------------- code/qcommon/q_shared.h | 18 ----- code/qcommon/sstring.h | 11 +++ code/rd-common/tr_public.h | 2 +- code/rd-common/tr_types.h | 2 + code/rd-vanilla/tr_backend.cpp | 7 +- code/rd-vanilla/tr_shade.cpp | 17 ++++ code/ui/ui_main.cpp | 8 +- code/ui/ui_shared.cpp | 5 +- code/ui/ui_shared.h | 7 +- codemp/CMakeLists.txt | 2 + codemp/botlib/l_memory.cpp | 11 +-- codemp/cgame/cg_draw.c | 4 +- codemp/client/cl_main.cpp | 2 +- codemp/game/bg_panimate.c | 5 -- codemp/game/g_cmds.c | 16 ++++ codemp/qcommon/common.cpp | 2 + codemp/qcommon/files.cpp | 81 +++++-------------- codemp/qcommon/md5.cpp | 136 ++++++++++++++++++++----------- codemp/qcommon/md5.h | 54 +++++++++++++ codemp/qcommon/net_ip.cpp | 82 +++++++++---------- codemp/qcommon/q_shared.c | 151 ---------------------------------- codemp/qcommon/q_shared.h | 19 ----- codemp/qcommon/vm.cpp | 2 - codemp/server/server.h | 31 ++----- codemp/server/sv_challenge.cpp | 180 +++++++++++++++++++++++++++++++++++++++++ codemp/server/sv_client.cpp | 123 +++------------------------- codemp/server/sv_init.cpp | 2 + codemp/ui/ui_shared.c | 9 +-- codemp/ui/ui_shared.h | 6 +- shared/qcommon/q_platform.h | 88 ++++++++++++++++++-- shared/qcommon/safe/files.cpp | 2 +- shared/qcommon/safe/files.h | 4 +- shared/qcommon/safe/string.cpp | 14 +++- shared/qcommon/safe/string.h | 3 + shared/sdl/sdl_sound.cpp | 3 + shared/sys/sys_main.cpp | 3 - shared/sys/sys_public.h | 4 +- tests/safe/string.cpp | 9 +++ tools/builds/make.bat | 2 +- 51 files changed, 641 insertions(+), 714 deletions(-) diff --cc code/qcommon/q_shared.h index 80ca063,a7e3899..47c1427 --- a/code/qcommon/q_shared.h +++ b/code/qcommon/q_shared.h @@@ -156,14 -153,8 +156,10 @@@ along with this program; if not, see <h #define idppc 0 #endif - short ShortSwap( short l ); - int LongSwap( int l ); - float FloatSwap( const float *f ); - #include "qcommon/q_platform.h" +#include "qcommon/ojk_saved_game_helper_fwd.h" + // ================================================================ // TYPE DEFINITIONS -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openjk.git _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits