]> code.delx.au - gnu-emacs-elpa/commitdiff
delx.au / code / gnu-emacs-elpa / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2f4c2c1 ac0fc89)
Merge commit 'ac0fc8962eaa15625b127c32f75d2b3daa1ca6ef' from swiper
authorOleh Krehel <ohwoeowho@gmail.com>
Mon, 20 Apr 2015 14:07:30 +0000 (16:07 +0200)
committerOleh Krehel <ohwoeowho@gmail.com>
Mon, 20 Apr 2015 14:07:30 +0000 (16:07 +0200)
1  2 
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/counsel.el
Simple merge
diff --cc packages/swiper/ivy.el
Simple merge
diff --cc packages/swiper/swiper.el
Simple merge