diff options
| author |  Guillaume Melquiond <guillaume.melquiond@inria.fr> | 2016-01-06 14:22:34 +0100 |
|---|---|---|
| committer | Guillaume Melquiond <guillaume.melquiond@inria.fr> | 2016-01-06 14:22:34 +0100 |
| commit | 1afa595012bbaf5fb89398b355f16159e1af399b (patch) | |
| tree | 255cc594c736debd1cbd53b92906e1fa10d80de5 /dev | |
| parent | 7ca0319268c2c6912e08c53deb742d5f7631e210 (diff) | |
| parent | 8b5d02d8706f99015c2ce8efcad32b7af228dd53 (diff) | |
Merge remote-tracking branch 'origin/v8.5' into trunk
Conflicts:
lib/cSig.mli
Diffstat (limited to 'dev')
| -rw-r--r-- | dev/printers.mllib | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dev/printers.mllib b/dev/printers.mllib index b498c2659..7f9da4eab 100644 --- a/dev/printers.mllib +++ b/dev/printers.mllib @@ -17,6 +17,8 @@ Backtrace IStream Pp_control Loc +CList +CString Compat Flags Control @@ -29,8 +31,6 @@ Segmenttree Unicodetable Unicode CObj -CList -CString CArray CStack Util |