]> code.delx.au - gnu-emacs-elpa/commitdiff
delx.au / code / gnu-emacs-elpa / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fddedd2 5a2e0fd)
Merge commit '5a2e0fd355fea83e3c172402b965a1aa826fcc0c' from swiper
authorOleh Krehel <ohwoeowho@gmail.com>
Fri, 1 May 2015 14:22:31 +0000 (16:22 +0200)
committerOleh Krehel <ohwoeowho@gmail.com>
Fri, 1 May 2015 14:22:31 +0000 (16:22 +0200)
1  2 
packages/swiper/Makefile patch | diff1 | diff2 | blob | history
packages/swiper/colir.el patch | | diff2 | blob | history
packages/swiper/counsel.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/Makefile
Simple merge
diff --cc packages/swiper/colir.el
index 0000000000000000000000000000000000000000,f5ce0aef8ac31248a2979b66a85960134b9a29a1..f5ce0aef8ac31248a2979b66a85960134b9a29a1
mode 000000,100644..100644
--- /dev/null
--- 2/colir.el
+++ b/packages/swiper/colir.el
diff --cc packages/swiper/counsel.el
Simple merge
diff --cc packages/swiper/ivy.el
Simple merge
diff --cc packages/swiper/swiper.el
Simple merge