]> code.delx.au - gnu-emacs-elpa/commitdiff
Merge commit 'e264139e7fafbd1bbb68f9cef6d1c50b8e6cf1f3' from swiper
authorOleh Krehel <ohwoeowho@gmail.com>
Tue, 8 Dec 2015 10:48:22 +0000 (11:48 +0100)
committerOleh Krehel <ohwoeowho@gmail.com>
Tue, 8 Dec 2015 10:48:22 +0000 (11:48 +0100)
1  2 
packages/swiper/README.md
packages/swiper/colir.el
packages/swiper/counsel.el
packages/swiper/doc/Changelog.org
packages/swiper/doc/ivy.org
packages/swiper/doc/ivy.texi
packages/swiper/doc/style.css
packages/swiper/ivy-hydra.el
packages/swiper/ivy-test.el
packages/swiper/ivy.el
packages/swiper/swiper.el

Simple merge
Simple merge
Simple merge
Simple merge
index 0000000000000000000000000000000000000000,b26b00e49742dc7852ba453c0fb441f1b9082b48..b26b00e49742dc7852ba453c0fb441f1b9082b48
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,b06c68cf78bcdd65df12133916dfb436b3efadc5..b06c68cf78bcdd65df12133916dfb436b3efadc5
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,547b4f07e193eb0fb6772c7920d2ae2fbc2cd3e7..547b4f07e193eb0fb6772c7920d2ae2fbc2cd3e7
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge