]> code.delx.au - gnu-emacs-elpa/commitdiff
delx.au / code / gnu-emacs-elpa / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f099954 3575aaa)
Merge commit '3575aaa39f311822dcedd53235ba036e9cf68ab8' from js2-mode
authorDmitry Gutov <dgutov@yandex.ru>
Tue, 14 Jan 2014 02:34:55 +0000 (04:34 +0200)
committerDmitry Gutov <dgutov@yandex.ru>
Tue, 14 Jan 2014 02:34:55 +0000 (04:34 +0200)
1  2 
packages/js2-mode/.elpaignore patch | | diff2 | blob | history
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/.elpaignore
index 0000000000000000000000000000000000000000,b51163d7f1a3d383fc548ec3729a4c0027977d27..b51163d7f1a3d383fc548ec3729a4c0027977d27
mode 000000,100644..100644
--- /dev/null
--- 2/.elpaignore
+++ b/packages/js2-mode/.elpaignore
diff --cc packages/js2-mode/js2-imenu-extras.el
Simple merge
diff --cc packages/js2-mode/js2-mode.el
Simple merge