Merge commit '0cda39255827f283e7578cd469ae42daad9556a2' from js2-mode
authorDmitry Gutov <dgutov@yandex.ru>
Thu, 23 Jun 2016 01:12:33 +0000 (04:12 +0300)
committerDmitry Gutov <dgutov@yandex.ru>
Thu, 23 Jun 2016 01:12:33 +0000 (04:12 +0300)
1  2 
packages/js2-mode/Makefile
packages/js2-mode/NEWS.md
packages/js2-mode/README.md
packages/js2-mode/js2-mode.el
packages/js2-mode/js2-old-indent.el
packages/js2-mode/tests/externs.el
packages/js2-mode/tests/indent.el
packages/js2-mode/tests/json-path.el
packages/js2-mode/tests/parser.el

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 0000000,70aecef..70aecef
mode 000000,100644..100644
--- /dev/null
Simple merge