]> code.delx.au - gnu-emacs-elpa/commitdiff
delx.au / code / gnu-emacs-elpa / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c10ba4b ac93b9e)
Merge commit 'ac93b9eef9b6ac44d187b9688d68a7a5f205b3fe' from js2-mode
authorDmitry Gutov <dgutov@yandex.ru>
Fri, 24 Apr 2015 02:56:24 +0000 (05:56 +0300)
committerDmitry Gutov <dgutov@yandex.ru>
Fri, 24 Apr 2015 02:56:24 +0000 (05:56 +0300)
Conflicts:
packages/js2-mode/js2-mode.el

1  2 
packages/js2-mode/js2-mode.el patch | diff1 | diff2 | blob | history
packages/js2-mode/tests/indent.el patch | diff1 | diff2 | blob | history
packages/js2-mode/tests/parser.el patch | diff1 | diff2 | blob | history

diff --cc packages/js2-mode/js2-mode.el
Simple merge
diff --cc packages/js2-mode/tests/indent.el
Simple merge
diff --cc packages/js2-mode/tests/parser.el
Simple merge