[teeworlds] 04/05: Merge tag 'upstream/0.6.3+dfsg'

[Felix Geyer]

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

fgeyer pushed a commit to branch master
in repository teeworlds.

commit 84e4441e36e2c59cdfac1635fe3f2aee474a5ba4
Merge: b03cbd4 d6eebbe
Author: Felix Geyer <fgeyer at debian.org>
Date:   Mon Apr 25 19:12:07 2016 +0200

    Merge tag 'upstream/0.6.3+dfsg'
    
    Upstream version 0.6.3+dfsg
    
    # gpg: Signature made Mo 25 Apr 2016 19:12:05 CEST
    # gpg:                using RSA key 0xFE22C6FD83135D45
    # gpg: Good signature from "Felix Geyer <felix at fobos.de>" [ultimate]
    # gpg:                 aka "Felix Geyer <debfx-pkg at fobos.de>" [ultimate]
    # gpg:                 aka "Felix Geyer <debfx at kubuntu.org>" [ultimate]
    # gpg:                 aka "Felix Geyer <debfx at fobos.de>" [ultimate]
    # gpg:                 aka "Felix Geyer <debfx at ubuntu.com>" [ultimate]
    # gpg:                 aka "Felix Geyer <felix.geyer at fobos.de>" [ultimate]
    # gpg:                 aka "Felix Geyer <fgeyer at debian.org>" [ultimate]
    # Primary key fingerprint: 164C 7051 2F79 2947 6764  AB56 FE22 C6FD 8313 5D45

 .gitignore                            |  22 -----
 docs/conf/Data/ClassHierarchy.nd      | Bin 774 -> 0 bytes
 docs/conf/Data/ConfigFileInfo.nd      | Bin 26 -> 0 bytes
 docs/conf/Data/FileInfo.nd            | 180 ----------------------------------
 docs/conf/Data/ImageFileInfo.nd       | Bin 8 -> 0 bytes
 docs/conf/Data/ImageReferenceTable.nd | Bin 8 -> 0 bytes
 docs/conf/Data/IndexInfo.nd           | Bin 226 -> 0 bytes
 docs/conf/Data/PreviousMenuState.nd   | Bin 1462 -> 0 bytes
 docs/conf/Data/PreviousSettings.nd    | Bin 154 -> 0 bytes
 docs/conf/Data/SymbolTable.nd         | Bin 41681 -> 0 bytes
 docs/conf/Languages.txt               | 113 ---------------------
 docs/conf/Menu.txt                    | 113 ---------------------
 docs/conf/Topics.txt                  |  81 ---------------
 scripts/make_release.py               |   2 +-
 src/engine/server/server.cpp          |   4 +-
 src/engine/shared/console.h           |   7 +-
 src/engine/shared/masterserver.cpp    |   2 +-
 src/game/editor/editor.cpp            |   5 +
 src/game/editor/io.cpp                |   3 +
 src/game/version.h                    |   2 +-
 20 files changed, 16 insertions(+), 518 deletions(-)

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