]> code.delx.au - gnu-emacs-elpa/commitdiff
delx.au / code / gnu-emacs-elpa / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3d54459 675bd5f)
Merge commit '675bd5ff97f75fb7d838e6056442ce71adf85e56' from swiper
authorOleh Krehel <ohwoeowho@gmail.com>
Tue, 21 Apr 2015 12:02:16 +0000 (14:02 +0200)
committerOleh Krehel <ohwoeowho@gmail.com>
Tue, 21 Apr 2015 12:02:16 +0000 (14:02 +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