From a4c7f8bd98be2a200489325ff7c5061cf80ab4f3 Mon Sep 17 00:00:00 2001 From: Enrico Tassi Date: Tue, 27 Dec 2016 16:53:30 +0100 Subject: Imported Upstream version 8.6 --- .merlin | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to '.merlin') diff --git a/.merlin b/.merlin index 02420c4d..24226a91 100644 --- a/.merlin +++ b/.merlin @@ -1,7 +1,9 @@ -FLG -rectypes +FLG -rectypes -thread S config B config +S ide +B ide S lib B lib S intf @@ -12,6 +14,8 @@ S kernel/byterun B kernel/byterun S library B library +S engine +B engine S pretyping B pretyping S interp @@ -24,6 +28,8 @@ S printing B printing S parsing B parsing +S stm +B stm S toplevel B toplevel @@ -33,3 +39,5 @@ S tools/coqdoc B tools/coqdoc S dev B dev + +PKG threads.posix -- cgit v1.2.3