]> code.delx.au - gnu-emacs-elpa/commitdiff
delx.au / code / gnu-emacs-elpa / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 059c3d5 4a6a31d)
Merge commit '4a6a31d6d4d479720f4b66091892b0cda2377346' from hydra
authorOleh Krehel <ohwoeowho@gmail.com>
Sat, 28 Mar 2015 14:59:16 +0000 (15:59 +0100)
committerOleh Krehel <ohwoeowho@gmail.com>
Sat, 28 Mar 2015 14:59:16 +0000 (15:59 +0100)
1  2 
packages/hydra/hydra-examples.el 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/hydra-examples.el
Simple merge
diff --cc packages/hydra/hydra-test.el
Simple merge
diff --cc packages/hydra/hydra.el
Simple merge