aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxime Dénès2016-12-02 10:48:11 +0100
committerMaxime Dénès2016-12-02 10:48:11 +0100
commitc73e959c8021904783ca40f92e2e7438244cf3ca (patch)
treedfb84e2f73fcdf6f67b1660647b0b51e0eb1185f
parent3e6fa1cbdc0ec145728089000595b6ea29f37a4c (diff)
parentf35eb5737fcdc1430eb45372d5bb99109d0216a2 (diff)
Merge remote-tracking branch 'github/pr/382' into v8.6
Was PR#382: [merlin] Adjust merlin for ide.
-rw-r--r--.merlin2
-rw-r--r--ide/.merlin2
2 files changed, 3 insertions, 1 deletions
diff --git a/.merlin b/.merlin
index 7ae6422335..24226a9184 100644
--- a/.merlin
+++ b/.merlin
@@ -2,6 +2,8 @@ FLG -rectypes -thread
S config
B config
+S ide
+B ide
S lib
B lib
S intf
diff --git a/ide/.merlin b/ide/.merlin
index 3f3d9d275d..953b5dce4c 100644
--- a/ide/.merlin
+++ b/ide/.merlin
@@ -1,4 +1,4 @@
-PKG lablgtk2.sourceview2
+PKG unix laglgtk2 lablgtk2.sourceview2
S utils
B utils