]> code.delx.au - gnu-emacs-elpa/commitdiff
delx.au / code / gnu-emacs-elpa / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d183352 1380f8c)
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)
Conflicts:
packages/hydra/hydra.el
packages/hydra/lv.el

1  2 
packages/hydra/.dir-locals.el patch | | diff2 | blob | history
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
packages/hydra/lv.el patch | diff1 | diff2 | blob | history

diff --cc packages/hydra/.dir-locals.el
index 0000000000000000000000000000000000000000,eb08357c64593a5d1269e2ba4c5c3da15d61b4dc..eb08357c64593a5d1269e2ba4c5c3da15d61b4dc
mode 000000,100644..100644
--- /dev/null
--- 2/.dir-locals.el
+++ b/packages/hydra/.dir-locals.el
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
diff --cc packages/hydra/lv.el
Simple merge