]> code.delx.au - gnu-emacs-elpa/commitdiff
delx.au / code / gnu-emacs-elpa / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e8eaf1a e953099)
Merge commit 'e9530990914c1d81889269b4a8365b8003625557' from swiper
authorOleh Krehel <ohwoeowho@gmail.com>
Tue, 30 Jun 2015 07:18:10 +0000 (09:18 +0200)
committerOleh Krehel <ohwoeowho@gmail.com>
Tue, 30 Jun 2015 07:18:10 +0000 (09:18 +0200)
1  2 
packages/swiper/colir.el patch | diff1 | diff2 | blob | history
packages/swiper/counsel.el patch | diff1 | diff2 | blob | history
packages/swiper/ivy-hydra.el patch | | diff2 | blob | history
packages/swiper/ivy-test.el patch | diff1 | diff2 | blob | history
packages/swiper/ivy.el patch | diff1 | diff2 | blob | history
packages/swiper/swiper.el patch | diff1 | diff2 | blob | history

diff --cc packages/swiper/colir.el
Simple merge
diff --cc packages/swiper/counsel.el
Simple merge
diff --cc packages/swiper/ivy-hydra.el
index 0000000000000000000000000000000000000000,03e4d208204a7de9a158e93a66718c3931c7aecc..03e4d208204a7de9a158e93a66718c3931c7aecc
mode 000000,100644..100644
--- /dev/null
--- 2/ivy-hydra.el
+++ b/packages/swiper/ivy-hydra.el
diff --cc packages/swiper/ivy-test.el
Simple merge
diff --cc packages/swiper/ivy.el
Simple merge
diff --cc packages/swiper/swiper.el
Simple merge