]> code.delx.au - gnu-emacs-elpa/commitdiff
delx.au / code / gnu-emacs-elpa / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f31d537 440c41c)
Merge commit '440c41cc3f5137d694211719abaa38c0193a08a2' from hydra
authorOleh Krehel <ohwoeowho@gmail.com>
Sat, 24 Jan 2015 20:29:17 +0000 (21:29 +0100)
committerOleh Krehel <ohwoeowho@gmail.com>
Sat, 24 Jan 2015 20:29:17 +0000 (21:29 +0100)
1  2 
packages/hydra/hydra-examples.el patch | diff1 | diff2 | blob | history
packages/hydra/hydra.el patch | diff1 | diff2 | blob | history

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