]> code.delx.au - gnu-emacs-elpa/commitdiff
delx.au / code / gnu-emacs-elpa / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 98073fe 8d38a89)
Merge commit '8d38a898f23b3105c5d098f0cfb6c3383547e394' from avy
authorOleh Krehel <ohwoeowho@gmail.com>
Thu, 25 Jun 2015 10:09:34 +0000 (12:09 +0200)
committerOleh Krehel <ohwoeowho@gmail.com>
Thu, 25 Jun 2015 10:09:34 +0000 (12:09 +0200)
1  2 
packages/avy/Makefile patch | diff1 | diff2 | blob | history
packages/avy/README.md patch | diff1 | diff2 | blob | history
packages/avy/avy.el patch | diff1 | diff2 | blob | history
packages/avy/doc/Changelog.org patch | | diff2 | blob | history
packages/avy/targets/avy-init.el patch | diff1 | diff2 | blob | history

diff --cc packages/avy/Makefile
Simple merge
diff --cc packages/avy/README.md
Simple merge
diff --cc packages/avy/avy.el
Simple merge
diff --cc packages/avy/doc/Changelog.org
index 0000000000000000000000000000000000000000,7dbcdf10721e38662eb74955cb51373e2e76b2c6..7dbcdf10721e38662eb74955cb51373e2e76b2c6
mode 000000,100644..100644
--- /dev/null
--- 2/doc/Changelog.org
+++ b/packages/avy/doc/Changelog.org
diff --cc packages/avy/targets/avy-init.el
Simple merge