dgutov pushed a commit to branch master
in repository elpa.
commit 4e4c53b640bb2f6b5d9ab2f00857221dcce325b8
Merge: 46fb875 2c74481
Author: Dmitry Gutov <[email protected]>
Date: Sat Nov 15 22:53:53 2014 +0200
Merge commit '2c744815cf9e4653625dd25f2e7f8b59c152782d' from js2-mode
Conflicts:
packages/js2-mode/js2-imenu-extras.el
packages/js2-mode/LICENSE | 674 +++++++++++++++++++++++++++++
packages/js2-mode/README.md | 22 +-
packages/js2-mode/js2-imenu-extras.el | 116 ++++--
packages/js2-mode/js2-mode.el | 752 +++++++++++++++++++--------------
packages/js2-mode/tests/parser.el | 81 ++++-
5 files changed, 1294 insertions(+), 351 deletions(-)
diff --cc packages/js2-mode/LICENSE
index 0000000,94a9ed0..94a9ed0
mode 000000,100644..100644
--- a/packages/js2-mode/LICENSE
+++ b/packages/js2-mode/LICENSE
