]> code.delx.au - gnu-emacs-elpa/commitdiff
delx.au / code / gnu-emacs-elpa / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7e618a5 e242f04)
Merge commit 'e242f04e32c7d874c779fb83c86aa5bdbc508f18' from avy
authorOleh Krehel <ohwoeowho@gmail.com>
Sat, 9 May 2015 11:50:39 +0000 (13:50 +0200)
committerOleh Krehel <ohwoeowho@gmail.com>
Sat, 9 May 2015 11:50:39 +0000 (13:50 +0200)
Conflicts:
packages/avy/avy.el

1  2 
packages/avy/.dir-locals.el patch | | diff2 | blob | history
packages/avy/README.md patch | diff1 | diff2 | blob | history
packages/avy/avy-jump.el patch | diff1 | diff2 | blob | history
packages/avy/avy.el patch | diff1 | diff2 | blob | history

diff --cc packages/avy/.dir-locals.el
index 0000000000000000000000000000000000000000,3bcda9266b706aa6092637b925886afa9eb05773..3bcda9266b706aa6092637b925886afa9eb05773
mode 000000,100644..100644
--- /dev/null
--- 2/.dir-locals.el
+++ b/packages/avy/.dir-locals.el
diff --cc packages/avy/README.md
Simple merge
diff --cc packages/avy/avy-jump.el
Simple merge
diff --cc packages/avy/avy.el
Simple merge