]> code.delx.au - gnu-emacs-elpa/commitdiff
delx.au / code / gnu-emacs-elpa / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8b585bc 68bcaa8)
Merge commit '68bcaa8d8df5518217a3833fd1bb400c8225fe02' from hydra
authorOleh Krehel <ohwoeowho@gmail.com>
Sun, 8 Feb 2015 15:01:45 +0000 (16:01 +0100)
committerOleh Krehel <ohwoeowho@gmail.com>
Sun, 8 Feb 2015 15:01:45 +0000 (16:01 +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