]> code.delx.au - gnu-emacs-elpa/commitdiff
delx.au / code / gnu-emacs-elpa / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 28af4b0 a84065d)
Merge remote-tracking branch 'js2-mode/master'
authorDmitry Gutov <dgutov@yandex.ru>
Wed, 6 Nov 2013 17:53:12 +0000 (19:53 +0200)
committerDmitry Gutov <dgutov@yandex.ru>
Wed, 6 Nov 2013 17:53:12 +0000 (19:53 +0200)
1  2 
packages/js2-mode/.dir-locals.el patch | | diff2 | blob | history
packages/js2-mode/js2-mode.el patch | diff1 | diff2 | blob | history
packages/js2-mode/tests/externs.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/.dir-locals.el
index 0000000000000000000000000000000000000000,db359736bbbd7e49eeb40b4240665b1c7d1f6216..db359736bbbd7e49eeb40b4240665b1c7d1f6216
mode 000000,100644..100644
--- /dev/null
--- 2/.dir-locals.el
+++ b/packages/js2-mode/.dir-locals.el
diff --cc packages/js2-mode/js2-mode.el
Simple merge
diff --cc packages/js2-mode/tests/externs.el
Simple merge
diff --cc packages/js2-mode/tests/indent.el
Simple merge
diff --cc packages/js2-mode/tests/parser.el
Simple merge