From: Oleh Krehel <ohwoeowho@gmail.com>
Date: Mon, 25 Apr 2016 10:10:45 +0000 (+0200)
Subject: Merge commit 'db005182ad0fd05c07e8e5c085abe6c750e6c578' from ivy
X-Git-Url: https://code.delx.au/gnu-emacs-elpa/commitdiff_plain/39a458ed74ecb2015e933438a547846abed973a0

Merge commit 'db005182ad0fd05c07e8e5c085abe6c750e6c578' from ivy
---

39a458ed74ecb2015e933438a547846abed973a0
diff --cc packages/ivy/.dir-locals.el
index 000000000,000000000..3bcda9266
new file mode 100644
--- /dev/null
+++ b/packages/ivy/.dir-locals.el
@@@ -1,0 -1,0 +1,5 @@@
++;;; Directory Local Variables
++;;; For more information see (info "(emacs) Directory Variables")
++
++((emacs-lisp-mode
++  (indent-tabs-mode . nil)))
diff --cc packages/ivy/doc/ivy-help.org
index 000000000,989c0e4d1..989c0e4d1
mode 000000,100644..100644
--- a/packages/ivy/doc/ivy-help.org
+++ b/packages/ivy/doc/ivy-help.org
diff --cc packages/ivy/doc/ivy-ox.el
index 000000000,cb69c7f23..cb69c7f23
mode 000000,100644..100644
--- a/packages/ivy/doc/ivy-ox.el
+++ b/packages/ivy/doc/ivy-ox.el