diff options
| author | Guillaume Melquiond | 2016-01-06 14:22:34 +0100 |
|---|---|---|
| committer | Guillaume Melquiond | 2016-01-06 14:22:34 +0100 |
| commit | 1afa595012bbaf5fb89398b355f16159e1af399b (patch) | |
| tree | 255cc594c736debd1cbd53b92906e1fa10d80de5 /plugins/firstorder | |
| parent | 7ca0319268c2c6912e08c53deb742d5f7631e210 (diff) | |
| parent | 8b5d02d8706f99015c2ce8efcad32b7af228dd53 (diff) | |
Merge remote-tracking branch 'origin/v8.5' into trunk
Conflicts:
lib/cSig.mli
Diffstat (limited to 'plugins/firstorder')
| -rw-r--r-- | plugins/firstorder/sequent.mli | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/firstorder/sequent.mli b/plugins/firstorder/sequent.mli index dc3f05be69..760168c9f6 100644 --- a/plugins/firstorder/sequent.mli +++ b/plugins/firstorder/sequent.mli @@ -13,7 +13,7 @@ open Globnames module OrderedConstr: Set.OrderedType with type t=constr -module CM: Map.S with type key=constr +module CM: CSig.MapS with type key=constr type h_item = global_reference * (int*constr) option |