This is an automated email from the git hooks/post-receive script. bmarc pushed a commit to branch master in repository 7kaa.
commit ddd7e7ef85fd34d9e7d4f9b52df0738cd0b0dfa6 Merge: fa47aa6 e3b5d91 Author: Bertrand Marc <[email protected]> Date: Mon Sep 12 20:26:39 2016 +0200 Merge tag 'upstream/2.14.6' Upstream version 2.14.6 .gitignore | 1 + COPYING.uuid | 25 + README | 24 +- configure.ac | 87 +- data/resource/help.res | 4 + include/CRC.h | 2 +- include/DMOUSE.h | 199 - include/IMGFUN.h | 74 +- include/MPTYPES.h | 1 - include/Makefile.am | 8 +- include/OAUDIO.h | 4 +- include/OERRCTRL.h | 2 +- include/OFIRM.h | 2 +- include/OGAME.h | 7 +- include/OMISC.h | 16 + include/OMOUSE.h | 9 +- include/OREMOTE.h | 2 + include/OSYS.h | 3 + include/OVGA.h | 4 +- include/asmfun.h | 21 +- include/c99_printf.h | 62 + include/dsound_audio.h | 146 - include/{gettext.h => gettext-gnu.h} | 66 +- include/gettext.h | 385 +- include/misc_uuid.h | 59 + include/mouse_dinput.h | 239 - include/mouse_sdl.h | 13 +- include/multiplayer.h | 129 +- include/openal_audio.h | 2 +- include/player_desc.h | 2 +- include/surface.h | 4 +- include/surface_ddraw.h | 69 - include/version.h | 6 +- include/vga_base.h | 6 +- include/vga_ddraw.h | 96 - include/vga_none.h | 6 +- include/vga_sdl.h | 7 +- packaging/windows/install.nsi | 2 + po/de.po | 8275 ++++++++++++++++++++++++++++++++ po/es.po | 8213 +++++++++++++++++++++++++++++++ po/fr.po | 8259 +++++++++++++++++++++++++++++++ src/audio/Makefile.am | 4 - src/audio/dsound/Makefile.am | 2 - src/audio/dsound/dsound_audio.cpp | 2069 -------- src/audio/openal/openal_audio.cpp | 4 +- src/client/AM.cpp | 43 +- src/client/Makefile.am | 32 +- src/client/OAI_SPY.cpp | 6 +- src/client/OBATTLE.cpp | 14 + src/client/OBOX.cpp | 1 + src/client/OBULLET.cpp | 2 +- src/client/OBUTT3D.cpp | 2 + src/client/OBUTTCUS.cpp | 2 + src/client/OBUTTON.cpp | 3 + src/client/OFIRM.cpp | 46 +- src/client/OFIRMIF.cpp | 2 +- src/client/OFIRMIF3.cpp | 2 + src/client/OFLAME.cpp | 9 +- src/client/OF_BASE.cpp | 23 +- src/client/OF_CAMP.cpp | 24 +- src/client/OF_FACT.cpp | 31 +- src/client/OF_MARK.cpp | 2 +- src/client/OF_MINE.cpp | 34 +- src/client/OF_RESE.cpp | 31 +- src/client/OF_WAR.cpp | 31 +- src/client/OGAMEMP.cpp | 288 +- src/client/OGAMENCY.cpp | 1 + src/client/OGAMEND.cpp | 8 + src/client/OGAMMAIN.cpp | 8 + src/client/OGAMMENU.cpp | 3 + src/client/OGAMSCE2.cpp | 1 + src/client/OGAMSING.cpp | 1 + src/client/OGFILEA.cpp | 1 + src/client/OHELP.cpp | 1 + src/client/OINGMENU.cpp | 2 + src/client/OOPTMENU.cpp | 1 + src/client/ORACERES.cpp | 24 +- src/client/OSCROLL.cpp | 1 + src/client/OSYS.cpp | 41 +- src/client/OSYS2.cpp | 11 +- src/client/OTERRAIN.cpp | 2 +- src/client/OTOWN.cpp | 1 + src/client/OTUTOR2.cpp | 1 + src/client/OVOLUME.cpp | 2 +- src/client/OWORLD.cpp | 10 +- src/common/Makefile.am | 3 +- src/common/OMISC.cpp | 39 +- src/common/misc_uuid.cpp | 356 ++ src/file/OFILE.cpp | 24 +- src/imgfun/Makefile.am | 48 +- src/imgfun/{ => generic}/CRC.cpp | 0 src/imgfun/{ => generic}/IB.cpp | 0 src/imgfun/{ => generic}/IB2.cpp | 0 src/imgfun/{ => generic}/IB_32.cpp | 0 src/imgfun/{ => generic}/IB_A.cpp | 0 src/imgfun/{ => generic}/IB_AR.cpp | 0 src/imgfun/{ => generic}/IB_AT.cpp | 0 src/imgfun/{ => generic}/IB_ATD.cpp | 0 src/imgfun/{ => generic}/IB_ATDM.cpp | 0 src/imgfun/{ => generic}/IB_ATR.cpp | 0 src/imgfun/{ => generic}/IB_ATRD.cpp | 0 src/imgfun/{ => generic}/IB_ATRDM.cpp | 0 src/imgfun/{ => generic}/IB_DW.cpp | 0 src/imgfun/{ => generic}/IB_R.cpp | 0 src/imgfun/{ => generic}/IB_RD.cpp | 0 src/imgfun/{ => generic}/IB_T.cpp | 0 src/imgfun/{ => generic}/IB_TD.cpp | 0 src/imgfun/{ => generic}/IB_TDM.cpp | 0 src/imgfun/{ => generic}/IB_TR.cpp | 0 src/imgfun/{ => generic}/IB_TRD.cpp | 0 src/imgfun/{ => generic}/IB_TRDM.cpp | 0 src/imgfun/{ => generic}/IC.cpp | 0 src/imgfun/{ => generic}/IC_R.cpp | 0 src/imgfun/{ => generic}/IJ_T.cpp | 0 src/imgfun/{ => generic}/IR.cpp | 0 src/imgfun/{ => generic}/IR_A.cpp | 0 src/imgfun/{ => generic}/IR_AM.cpp | 0 src/imgfun/{ => generic}/IR_BAR.cpp | 0 src/imgfun/{ => generic}/IR_M.cpp | 0 src/imgfun/{ => generic}/I_BAR.cpp | 0 src/imgfun/{ => generic}/I_BLACK.cpp | 0 src/imgfun/{ => generic}/I_EMASK.cpp | 0 src/imgfun/{ => generic}/I_EREMAP.cpp | 0 src/imgfun/{ => generic}/I_FONT.cpp | 0 src/imgfun/{ => generic}/I_FREMAP.cpp | 0 src/imgfun/{ => generic}/I_LINE.cpp | 0 src/imgfun/{ => generic}/I_PIXEL.cpp | 0 src/imgfun/{ => generic}/I_READ.cpp | 0 src/imgfun/{ => generic}/I_SNOW.cpp | 0 src/imgfun/{ => generic}/Makefile.am | 6 +- src/imgfun/{asm => x86}/ALL.inc | 0 src/imgfun/{asm => x86}/COLCODE.inc | 0 src/imgfun/{asm => x86}/CRC.asm | 0 src/imgfun/{asm => x86}/IB.asm | 0 src/imgfun/{asm => x86}/IB2.asm | 0 src/imgfun/{asm => x86}/IB_32.asm | 0 src/imgfun/{asm => x86}/IB_A.asm | 0 src/imgfun/{asm => x86}/IB_AR.asm | 0 src/imgfun/{asm => x86}/IB_AT.asm | 0 src/imgfun/{asm => x86}/IB_ATD.asm | 0 src/imgfun/{asm => x86}/IB_ATDM.asm | 0 src/imgfun/{asm => x86}/IB_ATM.asm | 0 src/imgfun/{asm => x86}/IB_ATR.asm | 0 src/imgfun/{asm => x86}/IB_ATRD.asm | 0 src/imgfun/{asm => x86}/IB_ATRDM.asm | 0 src/imgfun/{asm => x86}/IB_DW.asm | 0 src/imgfun/{asm => x86}/IB_R.asm | 0 src/imgfun/{asm => x86}/IB_RD.asm | 0 src/imgfun/{asm => x86}/IB_T.asm | 0 src/imgfun/{asm => x86}/IB_TD.asm | 0 src/imgfun/{asm => x86}/IB_TDM.asm | 0 src/imgfun/{asm => x86}/IB_TM1.asm | 0 src/imgfun/{asm => x86}/IB_TM2.asm | 0 src/imgfun/{asm => x86}/IB_TM3.asm | 0 src/imgfun/{asm => x86}/IB_TR.asm | 0 src/imgfun/{asm => x86}/IB_TRD.asm | 0 src/imgfun/{asm => x86}/IB_TRDM.asm | 0 src/imgfun/{asm => x86}/IC.asm | 0 src/imgfun/{asm => x86}/IC_R.asm | 0 src/imgfun/{asm => x86}/IJ_T.asm | 0 src/imgfun/{asm => x86}/IMGFUN.inc | 0 src/imgfun/{asm => x86}/IR.asm | 0 src/imgfun/{asm => x86}/IR_A.asm | 0 src/imgfun/{asm => x86}/IR_AM.asm | 0 src/imgfun/{asm => x86}/IR_BAR.asm | 0 src/imgfun/{asm => x86}/IR_M.asm | 0 src/imgfun/{asm => x86}/I_BAR.asm | 0 src/imgfun/{asm => x86}/I_BLACK.asm | 0 src/imgfun/{asm => x86}/I_CTRL.asm | 0 src/imgfun/{asm => x86}/I_EMASK.asm | 0 src/imgfun/{asm => x86}/I_EREMAP.asm | 0 src/imgfun/{asm => x86}/I_FONT.asm | 0 src/imgfun/{asm => x86}/I_FREMAP.asm | 0 src/imgfun/{asm => x86}/I_LINE.asm | 0 src/imgfun/{asm => x86}/I_PIXEL.asm | 0 src/imgfun/{asm => x86}/I_READ.asm | 0 src/imgfun/{asm => x86}/I_SNOW.asm | 0 src/imgfun/{asm => x86}/I_XOR.asm | 0 src/imgfun/{asm => x86}/Makefile.am | 9 +- src/input/Makefile.am | 4 - src/input/dinput/Makefile.am | 2 - src/input/dinput/OMOUSE.cpp | 1793 ------- src/input/sdl/OMOUSE.cpp | 67 +- src/multiplayer/common/OERRCTRL.cpp | 2 +- src/multiplayer/common/OREMOTE2.cpp | 4 +- src/multiplayer/common/OREMOTEM.cpp | 19 + src/multiplayer/common/multiplayer.cpp | 588 ++- src/multiplayer/common/player_desc.cpp | 2 +- src/video/Makefile.am | 4 - src/video/ddraw/Makefile.am | 5 - src/video/ddraw/OVGA.cpp | 638 --- src/video/ddraw/surface_ddraw.cpp | 241 - src/video/ddraw/vga_win.cpp | 259 - src/video/none/vga_none.cpp | 24 +- src/video/sdl/vga_sdl.cpp | 81 +- 195 files changed, 26803 insertions(+), 6783 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/7kaa.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
