]> code.delx.au - gnu-emacs-elpa/commit
Merge commit '1380f8c1a51f31514125a08f632d017cdfb8e26e' from hydra
authorOleh Krehel <ohwoeowho@gmail.com>
Fri, 1 May 2015 14:19:05 +0000 (16:19 +0200)
committerOleh Krehel <ohwoeowho@gmail.com>
Fri, 1 May 2015 14:19:05 +0000 (16:19 +0200)
commitfddedd20a99a84be82c14bc76c63c56d2fb9b570
tree0227334b04d2ece5d9fc3f303ff7f105f8d59390
parentd183352b36beda3e0b522163e18c0e0e75e4aeef
parent1380f8c1a51f31514125a08f632d017cdfb8e26e
Merge commit '1380f8c1a51f31514125a08f632d017cdfb8e26e' from hydra

Conflicts:
packages/hydra/hydra.el
packages/hydra/lv.el
packages/hydra/.dir-locals.el
packages/hydra/hydra-examples.el
packages/hydra/hydra-test.el
packages/hydra/hydra.el
packages/hydra/lv.el