]> code.delx.au - gnu-emacs-elpa/commitdiff
delx.au / code / gnu-emacs-elpa / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6ad010c 0e327f7)
Merge commit '0e327f72bdffc5bc4a1fbc34a8da1b7066e819b3'
authorThierry Volpiatto <thierry.volpiatto@gmail.com>
Wed, 18 May 2016 10:35:40 +0000 (12:35 +0200)
committerThierry Volpiatto <thierry.volpiatto@gmail.com>
Wed, 18 May 2016 10:35:40 +0000 (12:35 +0200)
1  2 
packages/async/README.md patch | diff1 | diff2 | blob | history
packages/async/async-bytecomp.el patch | diff1 | diff2 | blob | history
packages/async/async-pkg.el patch | | diff2 | blob | history
packages/async/async.el patch | diff1 | diff2 | blob | history
packages/async/dired-async.el patch | diff1 | diff2 | blob | history
packages/async/smtpmail-async.el patch | diff1 | diff2 | blob | history

diff --cc packages/async/README.md
Simple merge
diff --cc packages/async/async-bytecomp.el
Simple merge
diff --cc packages/async/async-pkg.el
index 0000000000000000000000000000000000000000,363e9420f6612d1b526dcc3e8cddb2a219723baa..363e9420f6612d1b526dcc3e8cddb2a219723baa
mode 000000,100644..100644
--- /dev/null
--- 2/async-pkg.el
+++ b/packages/async/async-pkg.el
diff --cc packages/async/async.el
Simple merge
diff --cc packages/async/dired-async.el
Simple merge
diff --cc packages/async/smtpmail-async.el
Simple merge