summaryrefslogtreecommitdiff
path: root/ocamldoc/odoc_inherit.ml
diff options
context:
space:
mode:
authorLuc Maranget <luc.maranget@inria.fr>2010-06-04 19:19:34 +0000
committerLuc Maranget <luc.maranget@inria.fr>2010-06-04 19:19:34 +0000
commitdab439ae7e4104cfc8b0594034f9875f4ebd4e6c (patch)
treeda7fb8c5f3207b0f3c95468c2401dc0d3b3b583d /ocamldoc/odoc_inherit.ml
parent5b7dec533cc582b34e31ed5d1b6b6f6e313a306e (diff)
downloadocaml-dab439ae7e4104cfc8b0594034f9875f4ebd4e6c.tar.gz
merge 3.12
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/jocamltrunk@10519 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'ocamldoc/odoc_inherit.ml')
-rw-r--r--ocamldoc/odoc_inherit.ml1
1 files changed, 0 insertions, 1 deletions
diff --git a/ocamldoc/odoc_inherit.ml b/ocamldoc/odoc_inherit.ml
index 705bf4ad3c..b73796bf8a 100644
--- a/ocamldoc/odoc_inherit.ml
+++ b/ocamldoc/odoc_inherit.ml
@@ -10,4 +10,3 @@
(***********************************************************************)
(* $Id$ *)
-