[Pkg-ocaml-maint-commits] [mldonkey] 02/07: Merge tag 'upstream/3.1.4'

[Mehdi Dogguy]

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

mehdi pushed a commit to branch master
in repository mldonkey.

commit 8d20f39b99b9e9a14d84c5f339bbbcd678f0162e
Merge: f6ee840 f79c514
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Thu Mar 27 00:14:19 2014 +0100

    Merge tag 'upstream/3.1.4'
    
    Upstream version 3.1.4

 config/Makefile.config.in                |    1 +
 config/configure                         |   98 +-
 config/configure.in                      |   89 +-
 distrib/ChangeLog                        |   43 +
 distrib/html_themes/ease/h.css           |    8 +-
 distrib/html_themes/old/h.css            |    8 +-
 icons/rsvg/splash_screen.svg             | 2349 +++++++++++++++---------------
 src/daemon/common/commonFile.mli         |    2 +-
 src/daemon/common/commonGlobals.ml       |    2 +-
 src/daemon/common/commonInteractive.ml   |   29 +
 src/daemon/common/commonMessages.ml      |   10 +-
 src/daemon/common/commonOptions.ml       |    4 +
 src/daemon/driver/driverCommands.ml      |   33 +-
 src/daemon/driver/driverControlers.ml    |   44 +-
 src/daemon/driver/driverInteractive.ml   |    6 +-
 src/daemon/driver/driverMain.ml          |    1 -
 src/networks/bittorrent/bTClients.ml     |   13 +-
 src/networks/bittorrent/bTInteractive.ml |  131 +-
 src/networks/bittorrent/bTUdpTracker.mlp |    5 +-
 src/networks/donkey/donkeyInteractive.ml |   23 +-
 src/networks/donkey/donkeyProtoUdp.ml    |    4 +-
 src/networks/fileTP/fileTPFTP.ml         |   44 +-
 src/utils/cdk/list2.ml                   |    6 +
 src/utils/cdk/list2.mli                  |    2 +
 src/utils/cdk/printexc2.ml               |   79 +-
 src/utils/cdk/printexc2.mli              |   31 +-
 src/utils/cdk/printf2.ml                 |  199 +--
 src/utils/cdk/printf2.mli                |   24 +-
 src/utils/cdk/unix2.ml                   |    2 +
 src/utils/lib/CryptoPP.cc                |    2 +-
 src/utils/lib/CryptoPP.h                 |    2 +-
 src/utils/lib/gettext.ml4                |  102 +-
 src/utils/lib/gettext.mli                |   47 +-
 src/utils/lib/options.ml4                |   18 +-
 src/utils/net/anyEndian.ml               |   13 +-
 src/utils/net/http_client.ml             |   10 +-
 src/utils/net/http_client.mli            |    6 +-
 src/utils/net/http_server.ml             |   64 +-
 src/utils/net/http_server.mli            |    9 +-
 src/utils/net/upnp_stubs.c               |   23 +-
 40 files changed, 1737 insertions(+), 1849 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/mldonkey.git