]> code.delx.au - gnu-emacs-elpa/commitdiff
delx.au / code / gnu-emacs-elpa / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a1ac1e0 6f142e3)
Merge commit '6f142e342a4228640cb50a45e224f932679355bb' from hydra
authorOleh Krehel <ohwoeowho@gmail.com>
Mon, 2 Feb 2015 09:56:30 +0000 (10:56 +0100)
committerOleh Krehel <ohwoeowho@gmail.com>
Mon, 2 Feb 2015 09:56:30 +0000 (10:56 +0100)
1  2 
packages/hydra/README.md patch | diff1 | diff2 | blob | history
packages/hydra/hydra-test.el patch | diff1 | diff2 | blob | history
packages/hydra/hydra.el patch | diff1 | diff2 | blob | history

diff --cc packages/hydra/README.md
Simple merge
diff --cc packages/hydra/hydra-test.el
Simple merge
diff --cc packages/hydra/hydra.el
Simple merge