]> code.delx.au - gnu-emacs-elpa/commit
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)
commit740b7e6f0e7f3dbc7f40600dffccf131c46a3607
treef7a7fb88ac2d302cb730cc251490ec3619f49e51
parent08e02f3e5083be70a197cbb26f4c95ddaa96eb84
parente084b5d9feab3dd1246e51ce1fddde3db6024f7d
Merge commit 'e084b5d9feab3dd1246e51ce1fddde3db6024f7d' from swiper

Conflicts:
packages/swiper/ivy.el
packages/swiper/README.md
packages/swiper/counsel.el
packages/swiper/ivy.el
packages/swiper/swiper.el