[Pkg-ocaml-maint-commits] [approx] 01/05: Merge branch 'upstream'

[Eric Cooper]

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

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

commit d4a9f235f1f4bd3d2aa84595626e7c1778200046
Merge: 0b98c8c 330c969
Author: Eric Cooper <ecc at cmu.edu>
Date:   Fri Jun 19 23:04:29 2015 -0400

    Merge branch 'upstream'

 Makefile                   |  15 +--
 _tags                      |  23 ++---
 approx.ml                  |   9 +-
 config.ml                  |  32 +++++--
 config.mli                 |   5 +-
 config_file.ml             |   4 +-
 config_file.mli            |   6 +-
 doc/approx.conf.5          |   3 +
 etc/approx.conf            |   1 +
 myocamlbuild.ml            |  28 ------
 tests/_tags                |  14 ---
 tests/config_file_test.ml  |  89 ++++++++++++++++++
 tests/config_test.ml       |  52 +++++++++--
 tests/control_file_test.ml | 180 ++++++++++++++++++++++++++++--------
 tests/dir_test.ml          |  28 ------
 tests/metadata_test.ml     |  33 -------
 tests/patch_test.ml        |  21 -----
 tests/runtests.ml          |  13 +++
 tests/sha1_test.ml         |  18 ----
 tests/testlib.ml           |  30 ++++++
 tests/util_test.ml         | 226 +++++++++++++++++++++++++++++++++++++++++++++
 url.ml                     |   6 +-
 util.ml                    |  36 +++++---
 util.mli                   |  21 ++++-
 24 files changed, 647 insertions(+), 246 deletions(-)

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