[monopd] 04/09: Merge tag 'upstream/0.10.0'

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository monopd.

commit 64024d5040505fd1da2ae713462b7787b1d56415
Merge: 964d0f5 4c17f1f
Author: Markus Koschany <apo at gambaru.de>
Date:   Fri Jul 17 22:05:48 2015 +0200

    Merge tag 'upstream/0.10.0'
    
    Upstream version 0.10.0
    
    # gpg: Signature made Fri 17 Jul 2015 22:05:44 CEST using RSA key ID 513B51E4
    # gpg: Good signature from "Markus Koschany <apo at gambaru.de>" [ultimate]
    # gpg:                 aka "Markus Koschany <markus at koschany.net>" [ultimate]

 API                    |   78 +--
 ChangeLog              |   44 +-
 Makefile.am            |    2 +-
 Makefile.in            |    2 +-
 NEWS                   |   44 +-
 README                 |    7 +-
 README.metaserver      |   50 ++
 README.monopigator     |   53 --
 conf/monopd.conf-dist  |   32 +-
 configure              |   18 +-
 configure.ac           |    7 +-
 games/atlantic.conf    |    2 +-
 src/Makefile.am        |    6 +-
 src/Makefile.in        |   14 +-
 src/auction.cpp        |   10 +-
 src/auction.h          |   12 +-
 src/card.cpp           |   10 +-
 src/card.h             |   10 +-
 src/cardgroup.cpp      |    8 +-
 src/cardgroup.h        |    8 +-
 src/debt.cpp           |    8 +-
 src/debt.h             |    8 +-
 src/display.cpp        |   73 ++-
 src/display.h          |   22 +-
 src/estate.cpp         |   10 +-
 src/estate.h           |   10 +-
 src/estategroup.cpp    |   42 +-
 src/estategroup.h      |    8 +-
 src/event.cpp          |   25 +-
 src/event.h            |   28 +-
 src/game.cpp           | 1034 ++++++++++++++++++------------------
 src/game.h             |   44 +-
 src/gameconfig.cpp     |    8 +-
 src/gameconfig.h       |    8 +-
 src/gameobject.cpp     |   10 +-
 src/gameobject.h       |   10 +-
 src/gameproperty.cpp   |    8 +-
 src/gameproperty.h     |    8 +-
 src/io.cpp             |   10 +-
 src/io.h               |   10 +-
 src/listener.cpp       |  339 +++++++++---
 src/listener.h         |   52 +-
 src/listenport.cpp     |   35 +-
 src/listenport.h       |   38 +-
 src/main.cpp           |  123 -----
 src/main.h             |   40 --
 src/player.cpp         |  327 ++++++++----
 src/player.h           |   32 +-
 src/server.cpp         | 1356 ++++++++++++++++++++++++------------------------
 src/server.h           |   57 +-
 src/socket.cpp         |  134 +++--
 src/socket.h           |   63 +--
 src/trade.cpp          |   37 +-
 src/trade.h            |   13 +-
 src/tradecomponent.cpp |    8 +-
 src/tradecomponent.h   |    8 +-
 56 files changed, 2365 insertions(+), 2098 deletions(-)

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