]> code.delx.au - gnu-emacs-elpa/commitdiff
delx.au / code / gnu-emacs-elpa / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 74573cb 2fd99e1)
Merge commit '2fd99e13ca15b6356c149deb74d6a2e78d0b264a' from swiper
authorOleh Krehel <ohwoeowho@gmail.com>
Thu, 16 Apr 2015 15:52:14 +0000 (17:52 +0200)
committerOleh Krehel <ohwoeowho@gmail.com>
Thu, 16 Apr 2015 15:52:14 +0000 (17:52 +0200)
1  2 
packages/swiper/ivy.el patch | diff1 | diff2 | blob | history
packages/swiper/swiper.el patch | diff1 | diff2 | blob | history

diff --cc packages/swiper/ivy.el
Simple merge
diff --cc packages/swiper/swiper.el
Simple merge