]> code.delx.au - gnu-emacs-elpa/commitdiff
delx.au / code / gnu-emacs-elpa / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5cf5b85 e0454a1)
Merge commit 'e0454a100541ce3f1f732b97894a3441cef3316f' from hydra
authorOleh Krehel <ohwoeowho@gmail.com>
Fri, 4 Mar 2016 19:59:27 +0000 (20:59 +0100)
committerOleh Krehel <ohwoeowho@gmail.com>
Fri, 4 Mar 2016 19:59:27 +0000 (20:59 +0100)
1  2 
packages/hydra/.elpaignore patch | | diff2 | blob | history
packages/hydra/hydra-examples.el patch | diff1 | diff2 | blob | history
packages/hydra/hydra.el patch | diff1 | diff2 | blob | history
packages/hydra/lv.el patch | diff1 | diff2 | blob | history

diff --cc packages/hydra/.elpaignore
index 0000000000000000000000000000000000000000,a6b1577f234330dc52deab12666309dd01358dfc..a6b1577f234330dc52deab12666309dd01358dfc
mode 000000,100644..100644
--- /dev/null
--- 2/.elpaignore
+++ b/packages/hydra/.elpaignore
diff --cc packages/hydra/hydra-examples.el
Simple merge
diff --cc packages/hydra/hydra.el
Simple merge
diff --cc packages/hydra/lv.el
Simple merge