Merge commit 'db005182ad0fd05c07e8e5c085abe6c750e6c578' from ivy

diff --cc packages/ivy/.dir-locals.el
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..3bcda9266b706aa6092637b925886afa9eb05773
new file mode 100644 (file)
--- /dev/null
--- /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/Makefile
Simple merge

diff --cc packages/ivy/README.md
Simple merge

diff --cc packages/ivy/colir.el
Simple merge

diff --cc packages/ivy/counsel.el
Simple merge

diff --cc packages/ivy/doc/Changelog.org
Simple merge

diff --cc packages/ivy/doc/ivy-help.org
index 0000000000000000000000000000000000000000,989c0e4d18217763e37316379e8345d92cf147ff..989c0e4d18217763e37316379e8345d92cf147ff
mode 000000,100644..100644
--- /dev/null
--- 2/doc/ivy-help.org
+++ b/packages/ivy/doc/ivy-help.org

diff --cc packages/ivy/doc/ivy-ox.el
index 0000000000000000000000000000000000000000,cb69c7f239d943cb3494007b0583c428e336aa31..cb69c7f239d943cb3494007b0583c428e336aa31
mode 000000,100644..100644
--- /dev/null
--- 2/doc/ivy-ox.el
+++ b/packages/ivy/doc/ivy-ox.el

diff --cc packages/ivy/doc/ivy.org
Simple merge

diff --cc packages/ivy/doc/ivy.texi
Simple merge

diff --cc packages/ivy/ivy-hydra.el
Simple merge

diff --cc packages/ivy/ivy-test.el
Simple merge

diff --cc packages/ivy/ivy.el
Simple merge

diff --cc packages/ivy/swiper.el
Simple merge