[Pkg-ocaml-maint-commits] [dose3] 05/07: Merge tag 'upstream/5.0_rc2' into experimental/master

[Ralf Treinen]

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

treinen pushed a commit to branch experimental/master
in repository dose3.

commit bf8249b4366514ab65d8fd70594723820904ec0d
Merge: 9010b4c 0740c4f
Author: Ralf Treinen <treinen at free.fr>
Date:   Wed Jun 15 20:14:35 2016 +0200

    Merge tag 'upstream/5.0_rc2' into experimental/master
    
    Upstream version 5.0~rc2

 Makefile                      |  3 +-
 algo/depsolver.ml             | 36 +++++++++++++-------
 algo/depsolver_int.ml         | 79 ++++++++++++++++++++-----------------------
 algo/depsolver_int.mli        | 34 +++++++++++--------
 algo/strongconflicts_int.ml   |  2 +-
 algo/strongdeps.ml            | 10 +++---
 applications/distcheck.ml     | 13 -------
 applications/outdated.ml      | 16 ++++-----
 common/edosSolver.ml          | 26 +++++++++++---
 configure                     | 18 +++++-----
 configure.ac                  |  2 +-
 deb/tests.ml                  |  4 ++-
 doseparse/stdLoaders.ml       |  2 +-
 pef/pef.itarget               |  4 ---
 versioning/versioning.itarget |  4 ---
 15 files changed, 132 insertions(+), 121 deletions(-)

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