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

lucas pushed a commit to branch master
in repository ocamlbricks.

commit 68c50d4c7cd0cf56e0b8b178c3ff1a0f0701389f
Merge: 95ac43b ab0af1d
Author: Lucas Nussbaum <lu...@debian.org>
Date:   Wed Apr 2 16:27:54 2014 +0200

    Merge tag 'upstream/0.90+bzr393'
    
    Upstream version 0.90+bzr393

 BASE/argv.mli                               |  35 +--
 BASE/fix.ml                                 |   8 +
 BASE/fix.mli                                |   2 +
 BASE/log_builder.ml                         | 139 +++++++-----
 BASE/log_builder.mli                        |  28 ++-
 BASE/ocamlbricks_log.ml                     |   3 +
 BASE/ocamlbricks_log.mli                    |  15 +-
 CAMLP4/log_module_loading_p4.ml             |   2 +-
 CAMLP4/log_module_loading_p4.mli            |   2 +-
 CAMLP4/raise_p4.ml                          |   2 +-
 CONFIGME                                    |   9 +-
 CONFIGURATION/configuration_files.ml        |  20 +-
 EXTRA/arrayExtra.ml                         | 127 +++++++++--
 EXTRA/arrayExtra.mli                        |  18 +-
 EXTRA/does-process-exist-c-wrapper.c        |   6 +-
 EXTRA/endpoint.ml                           | 121 ----------
 EXTRA/endpoint.mli                          |  43 ----
 EXTRA/limbo.ml                              | 275 -----------------------
 EXTRA/listExtra.ml                          |  53 ++++-
 EXTRA/listExtra.mli                         |  22 +-
 EXTRA/queueExtra.mli                        |   2 +
 EXTRA/stringExtra.ml                        |   7 +-
 EXTRA/stringExtra.mli                       |   2 +-
 EXTRA/threadExtra.ml                        |  61 ++---
 EXTRA/unixExtra.ml                          | 167 +++++++++++---
 EXTRA/unixExtra.mli                         |  35 ++-
 EXTRA/waitpid-c-wrapper.c                   |  12 +-
 GETTEXT/gettext-c-wrapper.c                 |   6 +-
 MARSHAL/marshallable_classes.mli            |   3 +
 META                                        |   1 -
 Makefile                                    | 112 ++++------
 Makefile.d/doc.sh                           |   8 +-
 Makefile.d/ocamlmklib_wrapper.sh            |   7 +-
 Makefile.d/test.sh                          |  40 ----
 Makefile.d/test_scripts_starting_section.sh |  91 --------
 Makefile.d/test_with.sh                     |  65 ++++++
 Makefile.d/test_with_utop.sh                |  48 ----
 Makefile.local                              |  44 ++--
 SHELL/linux.ml                              | 331 ++++++++++++++++++++++++++++
 SHELL/linux.mli                             | 299 +++++++++++++++++++++++++
 SHELL/shell.ml                              |  47 ++++
 SHELL/shell.mli                             |  10 +
 STRUCTURES/endpoint.ml                      | 321 +++++++++++++++++++++++++++
 STRUCTURES/endpoint.mli                     | 157 +++++++++++++
 STRUCTURES/forest.ml                        | 270 ++++++++++++++++-------
 STRUCTURES/forest.mli                       |  28 ++-
 STRUCTURES/ipv4.ml                          |  52 ++++-
 STRUCTURES/ipv4.mli                         |  12 +
 STRUCTURES/ipv6.ml                          |   2 +-
 STRUCTURES/memo.ml                          |   2 +-
 STRUCTURES/network.ml                       |  93 ++++----
 STRUCTURES/option.ml                        |   4 +
 STRUCTURES/option.mli                       |   1 +
 WIDGETS/widget.ml                           |  50 +++++
 WIDGETS/widget.mli                          |  14 ++
 meta.ml.released                            |  10 +-
 ocamlbricks.mllib                           |   1 +
 ocamlbricks.odocl                           |   1 +
 58 files changed, 2269 insertions(+), 1077 deletions(-)

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

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to