[armagetronad] 02/04: Merge tag 'upstream/0.2.8.3.4'

[Markus Koschany]

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

apo pushed a commit to branch master
in repository armagetronad.

commit 8ca55970f2ea2d764bc092a88e4e191c558dc6e7
Merge: 1f7ec4e b85b597
Author: Markus Koschany <apo at debian.org>
Date:   Tue Nov 29 13:57:36 2016 +0100

    Merge tag 'upstream/0.2.8.3.4'
    
    Upstream version 0.2.8.3.4
    
    # gpg: Signatur vom Di 29 Nov 2016 13:57:34 CET
    # gpg:                mittels RSA-Schlüssel ACF3D088EF32EDEF6A1A835FD9AD14B9513B51E4
    # gpg: Korrekte Signatur von "Markus Koschany <apo at gambaru.de>" [ultimativ]
    # gpg:                     alias "Markus Koschany <markus at koschany.net>" [ultimativ]
    # gpg:                     alias "Markus Koschany <apo at debian.org>" [ultimativ]

 ChangeLog                            |  114 +-
 INSTALL                              |   19 +-
 Makefile.in                          |  448 +++-----
 NEWS                                 |    7 +
 aclocal.m4                           |  690 ++++--------
 batch/Makefile.in                    |  129 +--
 compile                              |  347 ------
 config.sub                           |  292 ++---
 config/Makefile.in                   |  135 +--
 configure                            | 1498 +++++++++++--------------
 configure.ac                         |    6 +-
 depcomp                              |  531 +++------
 desktop/Makefile.in                  |  133 +--
 fingerprint                          |   12 +-
 install-sh                           |   35 +-
 language/deutsch.txt                 |   26 +-
 language/french.txt                  |   10 +-
 language/polish.txt                  |   26 +-
 language/polish_transliterated.txt   |   26 +-
 language/spanish.txt                 |   34 +-
 missing                              |  461 +++++---
 resource/Makefile.in                 |  113 +-
 src/Makefile.in                      | 2052 ++++++++++++++++------------------
 src/config_ide.h                     |    2 +-
 src/doc/Makefile.in                  |  306 +++--
 src/doc/bugs.html                    |    4 +-
 src/doc/changelog.html               |    4 +-
 src/doc/commands.html                |    4 +-
 src/doc/compile.html                 |    4 +-
 src/doc/config.html                  |    4 +-
 src/doc/faq.html                     |    4 +-
 src/doc/index.html                   |    4 +-
 src/doc/install_linux.html           |    8 +-
 src/doc/install_macosx.html          |    2 +-
 src/doc/install_windows.html         |    4 +-
 src/doc/net/Makefile.in              |  131 +--
 src/doc/net/index.html               |    4 +-
 src/doc/net/lower.html               |    4 +-
 src/doc/net/middle.html              |    4 +-
 src/doc/net/upper.html               |    4 +-
 src/doc/network.html                 |    4 +-
 src/doc/readme_macosx.html           |    2 +-
 src/doc/todo.html                    |    4 +-
 src/doc/versions.html                |    4 +-
 src/engine/eCamera.cpp               |    6 +-
 src/engine/eNetGameObject.cpp        |    6 +-
 src/engine/ePlayer.cpp               |   15 +-
 src/engine/eSound.cpp                |    6 +-
 src/engine/eTeam.cpp                 |   15 +-
 src/engine/eTeam.h                   |    4 +-
 src/first/Makefile.in                |  113 +-
 src/macosx/config_common.h.in        |    2 +-
 src/network/nNetObject.cpp           |   17 +-
 src/network/nNetObject.h             |   22 +-
 src/network/nSocket.cpp              |    2 +
 src/thirdparty/Makefile.in           |  285 ++---
 src/thirdparty/particles/Makefile.in |  292 ++---
 src/tools/tError.cpp                 |    5 +
 src/tools/tError.h                   |    4 +
 src/tools/tHeap.cpp                  |    2 +-
 src/tools/tLinkedList.cpp            |   10 +-
 src/tools/tLocale.cpp                |    7 +
 src/tools/tLocale.h                  |   11 +-
 src/tools/tResourceManager.cpp       |    2 +-
 src/tools/tSafePTR.h                 |   15 +-
 src/ui/uInput.cpp                    |    3 +-
 66 files changed, 3474 insertions(+), 5025 deletions(-)

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