This is an automated email from the git hooks/post-receive script.
mehdi pushed a commit to branch master
in repository otags.
commit a533c60d3da950579dc04a35ecc44b938d4b8862
Merge: b418d56 4a91b28
Author: Mehdi Dogguy <me...@debian.org>
Date: Sat Jan 16 16:54:20 2016 +0100
Merge tag 'upstream/4.02.2'
Upstream version 4.02.2
ChangeLog | 40 +++++++++++++++++++++++++++++++++
Makefile.in | 29 ++++++++++++++----------
add_quotation.ml | 4 ++--
add_quotation.mli | 4 ++--
camlp4_names.ml | 4 ++--
camlp4_names.mli | 4 ++--
conf.ml.in | 26 +++++++++++++++++++++
conf.mli | 4 ++--
configure | 6 ++---
doc/changes.html | 14 +++++++++---
doc/otags.1 | 8 +++++--
doc/otags.html | 12 +++++++---
emacs.ml | 4 ++--
emacs.mli | 4 ++--
global.ml | 4 ++--
global.mli | 4 ++--
misc.ml | 4 ++--
misc.mli | 4 ++--
monitor_line_directive.ml | 30 +++++++++++++++++++------
monitor_line_directive.mli | 29 +++++++++++++++++-------
otags.ml | 4 ++--
otags_dump_ast.ml | 26 +++++++++++++++++++++
parser_factory.ml | 4 ++--
parser_factory.mli | 4 ++--
parser_hints.ml | 28 +++++++++++++----------
parser_hints.mli | 4 ++--
reparse.ml | 4 ++--
reparse.mli | 4 ++--
source_channel.ml | 4 ++--
source_channel.mli | 4 ++--
tags.ml | 4 ++--
tags.mli | 4 ++--
test/cppo_h.include.ml | 12 ++++++++++
test/cppo_h.source.ml | 23 +++++++++++++++++++
test/cppo_i.include.ml | 12 ++++++++++
test/cppo_i.source.ml | 23 +++++++++++++++++++
test/test.TAGS | 28 +++++++++++++++++++++++
test/test.tags | 16 +++++++++++++
translate_location.ml | 56 +++++++++++++++++++++++++++++++++++++++++++---
translate_location.mli | 4 ++--
types.ml | 4 ++--
types.mli | 4 ++--
vi.ml | 4 ++--
vi.mli | 4 ++--
44 files changed, 417 insertions(+), 105 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/otags.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
