[Pkg-ocaml-maint-commits] [approx] 06/08: Merge branch 'upstream'

[Eric Cooper]

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

ecc-guest pushed a commit to branch master
in repository approx.

commit 4522b93bb0b8b6970748aab24bbff4316dfa098d
Merge: 2067e16 020c900
Author: Eric Cooper <ecc at cmu.edu>
Date:   Sat Jul 22 15:24:22 2017 -0400

    Merge branch 'upstream'

 _tags                      |  8 ++--
 approx.ml                  | 52 ++++++++++++-------------
 config.ml                  |  2 +-
 config_file.ml             |  4 +-
 control_file.ml            |  2 +-
 import.ml                  | 16 ++++----
 patch.ml                   |  4 +-
 tests/config_file_test.ml  |  2 +-
 tests/control_file_test.ml | 33 ++++++++--------
 tests/testlib.ml           |  4 +-
 tests/util_test.ml         |  4 +-
 url.ml                     |  6 +--
 util.ml                    | 96 ++++++++++++++++++++++++----------------------
 13 files changed, 117 insertions(+), 116 deletions(-)

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