]> code.delx.au - gnu-emacs-elpa/commitdiff
delx.au / code / gnu-emacs-elpa / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2452ff7 06b63f1)
Merge commit '06b63f1d718d12d15aaf9459b492944203764d2f' from hydra
authorOleh Krehel <ohwoeowho@gmail.com>
Fri, 30 Jan 2015 16:12:21 +0000 (17:12 +0100)
committerOleh Krehel <ohwoeowho@gmail.com>
Fri, 30 Jan 2015 16:12:21 +0000 (17:12 +0100)
1  2 
packages/hydra/.travis.yml patch | | diff2 | blob | history
packages/hydra/Makefile patch | | diff2 | blob | history
packages/hydra/README.md patch | diff1 | diff2 | blob | history
packages/hydra/hydra-examples.el patch | diff1 | diff2 | blob | history
packages/hydra/hydra-test.el patch | | diff2 | blob | history
packages/hydra/hydra.el patch | diff1 | diff2 | blob | history

diff --cc packages/hydra/.travis.yml
index 0000000000000000000000000000000000000000,1f5dbc73e7834405d44108457c10903e35a1ff9e..1f5dbc73e7834405d44108457c10903e35a1ff9e
mode 000000,100644..100644
--- /dev/null
--- 2/.travis.yml
+++ b/packages/hydra/.travis.yml
diff --cc packages/hydra/Makefile
index 0000000000000000000000000000000000000000,97bcea6d911b3e85c270ac8297053d8800406384..97bcea6d911b3e85c270ac8297053d8800406384
mode 000000,100644..100644
--- /dev/null
--- 2/Makefile
+++ b/packages/hydra/Makefile
diff --cc packages/hydra/README.md
Simple merge
diff --cc packages/hydra/hydra-examples.el
Simple merge
diff --cc packages/hydra/hydra-test.el
index 0000000000000000000000000000000000000000,8ee56eb097e71f42912fff8d0f09b21be4cd5649..8ee56eb097e71f42912fff8d0f09b21be4cd5649
mode 000000,100644..100644
--- /dev/null
--- 2/hydra-test.el
+++ b/packages/hydra/hydra-test.el
diff --cc packages/hydra/hydra.el
Simple merge