From 9043add656177eeac1491a73d2f3ab92bec0013c Mon Sep 17 00:00:00 2001 From: Benjamin Barenblat Date: Sat, 29 Dec 2018 14:31:27 -0500 Subject: Imported Upstream version 8.8.2 --- .merlin | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) (limited to '.merlin') diff --git a/.merlin b/.merlin index 24226a91..d60f5037 100644 --- a/.merlin +++ b/.merlin @@ -1,17 +1,17 @@ -FLG -rectypes -thread +FLG -rectypes -thread -safe-string -w +a-4-9-27-41-42-44-45-48-50 +S clib +B clib S config B config -S ide -B ide S lib B lib -S intf -B intf S kernel B kernel S kernel/byterun B kernel/byterun +S intf +B intf S library B library S engine @@ -30,8 +30,16 @@ S parsing B parsing S stm B stm +S vernac +B vernac S toplevel B toplevel +S plugins/ltac +B plugins/ltac +S API +B API +S ide +B ide S tools B tools @@ -40,4 +48,7 @@ B tools/coqdoc S dev B dev -PKG threads.posix +S plugins/** +B plugins/** + +PKG threads.posix camlp5 -- cgit v1.2.3