]> code.delx.au - gnu-emacs-elpa/commitdiff
delx.au / code / gnu-emacs-elpa / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 73fe889 2403973)
Merge commit '2403973be4f34893ec7d878dfafb1ef562f4d9cb' from hydra
authorOleh Krehel <ohwoeowho@gmail.com>
Fri, 30 Oct 2015 09:46:34 +0000 (10:46 +0100)
committerOleh Krehel <ohwoeowho@gmail.com>
Fri, 30 Oct 2015 09:46:34 +0000 (10:46 +0100)
1  2 
packages/hydra/hydra-test.el patch | diff1 | diff2 | blob | history
packages/hydra/hydra.el patch | diff1 | diff2 | blob | history

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