[Pkg-ocaml-maint-commits] [otags] 02/08: Merge tag 'upstream/4.00.1'

[Hendrik Tews]

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

hendrik-guest pushed a commit to branch master
in repository otags.

commit 806cb68ee3356dcbf5e98f0b7bb95e56c41a234e
Merge: 324cfaf 14c80b2
Author: Hendrik Tews <hendrik at askra.de>
Date:   Thu Aug 15 10:04:44 2013 +0200

    Merge tag 'upstream/4.00.1'
    
    Upstream version 4.00.1

 ChangeLog                  |   30 +++++++++++++++++++++
 INSTALL                    |    6 ++---
 Makefile.in                |    2 +-
 add_quotation.ml           |    2 +-
 add_quotation.mli          |    2 +-
 camlp4_names.ml            |    2 +-
 camlp4_names.mli           |    2 +-
 conf.mli                   |    2 +-
 configure                  |   12 ++++-----
 doc/changes.html           |   15 ++++++++---
 doc/otags.1                |   38 +++++++++++++-------------
 doc/otags.html             |   63 ++++++++++++++++++++------------------------
 emacs.ml                   |    2 +-
 emacs.mli                  |    2 +-
 global.ml                  |    2 +-
 global.mli                 |    2 +-
 misc.ml                    |    2 +-
 misc.mli                   |    2 +-
 monitor_line_directive.ml  |    2 +-
 monitor_line_directive.mli |    2 +-
 otags.ml                   |   10 ++++---
 parser_factory.ml          |    2 +-
 parser_factory.mli         |    2 +-
 parser_hints.ml            |    2 +-
 parser_hints.mli           |    2 +-
 reparse.ml                 |    2 +-
 reparse.mli                |    2 +-
 source_channel.ml          |    2 +-
 source_channel.mli         |    2 +-
 tags.ml                    |   49 +++++++++++++++++++++++++++++++---
 tags.mli                   |    2 +-
 test/a.ml                  |   11 ++++++++
 test/d.ml                  |    2 +-
 test/test.TAGS             |   21 +++++++++------
 test/test.tags             |    5 ++++
 translate_location.ml      |    2 +-
 translate_location.mli     |    2 +-
 types.ml                   |    2 +-
 types.mli                  |    2 +-
 util/dump-camlp4.ml        |   12 ++++++++-
 vi.ml                      |    2 +-
 vi.mli                     |    2 +-
 42 files changed, 219 insertions(+), 113 deletions(-)

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