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 /grammar | |
| parent | 7ca0319268c2c6912e08c53deb742d5f7631e210 (diff) | |
| parent | 8b5d02d8706f99015c2ce8efcad32b7af228dd53 (diff) | |
Merge remote-tracking branch 'origin/v8.5' into trunk
Conflicts:
lib/cSig.mli
Diffstat (limited to 'grammar')
| -rw-r--r-- | grammar/grammar.mllib | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/grammar/grammar.mllib b/grammar/grammar.mllib index b167643d3f..6098de8f03 100644 --- a/grammar/grammar.mllib +++ b/grammar/grammar.mllib @@ -17,13 +17,13 @@ Backtrace Pp_control Flags Loc +CList +CString Serialize Stateid Feedback Pp -CList -CString CArray CStack Util |