]> code.delx.au - gnu-emacs-elpa/commitdiff
delx.au / code / gnu-emacs-elpa / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 84c0e7b b359db6)
Merge commit 'b359db633e46987c9107e89199717c2194b9a045' from hydra
authorOleh Krehel <ohwoeowho@gmail.com>
Fri, 30 Jan 2015 19:58:20 +0000 (20:58 +0100)
committerOleh Krehel <ohwoeowho@gmail.com>
Fri, 30 Jan 2015 19:58:20 +0000 (20:58 +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