aboutsummaryrefslogtreecommitdiffhomepage
path: root/.merlin
diff options
context:
space:
mode:
authorGravatar Maxime Dénès <mail@maximedenes.fr>2017-05-21 14:50:25 +0200
committerGravatar Maxime Dénès <mail@maximedenes.fr>2017-06-06 17:41:37 +0200
commit014749917e5de9fe1885a1b1edc52b01cefa6f3f (patch)
tree5b6952c2d67b1c18ce5f6e22cc75cefc005ad460 /.merlin
parent0a577d3c979af094ca00be3e7e323109c7e1f6ab (diff)
Merge the ssr plugin.
Diffstat (limited to '.merlin')
-rw-r--r--.merlin5
1 files changed, 3 insertions, 2 deletions
diff --git a/.merlin b/.merlin
index b78f24551..c8d7d322f 100644
--- a/.merlin
+++ b/.merlin
@@ -1,7 +1,5 @@
FLG -rectypes -thread -safe-string -w +a-4-9-27-41-42-44-45-48-50
-S ltac
-B ltac
S config
B config
S ide
@@ -46,4 +44,7 @@ B tools/coqdoc
S dev
B dev
+S plugins/**
+B plugins/**
+
PKG threads.posix camlp5