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 /lib/cMap.mli | |
| parent | 7ca0319268c2c6912e08c53deb742d5f7631e210 (diff) | |
| parent | 8b5d02d8706f99015c2ce8efcad32b7af228dd53 (diff) | |
Merge remote-tracking branch 'origin/v8.5' into trunk
Conflicts:
lib/cSig.mli
Diffstat (limited to 'lib/cMap.mli')
| -rw-r--r-- | lib/cMap.mli | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/cMap.mli b/lib/cMap.mli index cd3d2f5b19..f032a6d7d8 100644 --- a/lib/cMap.mli +++ b/lib/cMap.mli @@ -25,7 +25,7 @@ module type S = Map.S module type ExtS = sig - include Map.S + include CSig.MapS (** The underlying Map library *) module Set : CSig.SetS with type elt = key |