]> code.delx.au - gnu-emacs-elpa/commitdiff
delx.au / code / gnu-emacs-elpa / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4e4c53b 3abcd90)
Merge commit '3abcd90ddc2f446ddf0fb874dd79ba870c26ad2d' from js2-mode
authorDmitry Gutov <dgutov@yandex.ru>
Tue, 18 Nov 2014 12:53:24 +0000 (14:53 +0200)
committerDmitry Gutov <dgutov@yandex.ru>
Tue, 18 Nov 2014 12:53:24 +0000 (14:53 +0200)
1  2 
packages/js2-mode/js2-imenu-extras.el patch | diff1 | diff2 | blob | history
packages/js2-mode/js2-mode.el patch | diff1 | diff2 | blob | history

diff --cc packages/js2-mode/js2-imenu-extras.el
Simple merge
diff --cc packages/js2-mode/js2-mode.el
Simple merge