]> code.delx.au - gnu-emacs-elpa/commitdiff
Merge commit 'e084b5d9feab3dd1246e51ce1fddde3db6024f7d' from swiper
authorOleh Krehel <ohwoeowho@gmail.com>
Sat, 23 May 2015 11:23:54 +0000 (13:23 +0200)
committerOleh Krehel <ohwoeowho@gmail.com>
Sat, 23 May 2015 11:23:54 +0000 (13:23 +0200)
Conflicts:
packages/swiper/ivy.el

1  2 
packages/swiper/README.md
packages/swiper/counsel.el
packages/swiper/ivy.el
packages/swiper/swiper.el

Simple merge
Simple merge
Simple merge
Simple merge