]> code.delx.au - gnu-emacs-elpa/commitdiff
delx.au / code / gnu-emacs-elpa / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2763c9a 494c421)
Merge commit '494c421bfa6f1b72b577267cb3841b0eff262250' from js2-mode
authorDmitry Gutov <dgutov@yandex.ru>
Sat, 18 Jul 2015 01:14:32 +0000 (04:14 +0300)
committerDmitry Gutov <dgutov@yandex.ru>
Sat, 18 Jul 2015 01:14:32 +0000 (04:14 +0300)
1  2 
packages/js2-mode/js2-mode.el patch | diff1 | diff2 | blob | history
packages/js2-mode/js2-old-indent.el patch | | diff2 | blob | history

diff --cc packages/js2-mode/js2-mode.el
Simple merge
diff --cc packages/js2-mode/js2-old-indent.el
index 0000000000000000000000000000000000000000,9b1c9296f0df31e09b05eed47ea2a24513f4cd69..9b1c9296f0df31e09b05eed47ea2a24513f4cd69
mode 000000,100644..100644
--- /dev/null
--- 2/js2-old-indent.el
+++ b/packages/js2-mode/js2-old-indent.el