Updated for new build system.

* Removed MerlinMake as submodule

Author: DBenYaakov

.dir-locals.el

@@ -0,0 +1,5 @@
+;;; Directory Local Variables
+;;; For more information see (info "(emacs) Directory Variables")
+
+((swift-mode
+  (flycheck-swift-include-search-paths  "/usr/local/lib/merlin/Igis-1.1.5/Igis/.build/debug")))

.gitmodules

@@ -1 +1 @@
-Igis	1.1.1
+Igis	1.1.5

MerlinMake

@@ -0,0 +1,2 @@
+#!/bin/bash
+makeSwift "$@"