From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 15 Aug 2013 04:10:38 +0000 (-0400)
Subject: Mark merge point of js2-mode.
X-Git-Url: https://code.delx.au/gnu-emacs-elpa/commitdiff_plain/c45346a3c823eaafc09b96d2c33ba945a287346a

Mark merge point of js2-mode.
---

c45346a3c823eaafc09b96d2c33ba945a287346a
diff --cc packages/js2-mode/.gitignore
index 000000000,000000000..c531d9867
new file mode 100644
--- /dev/null
+++ b/packages/js2-mode/.gitignore
@@@ -1,0 -1,0 +1,1 @@@
++*.elc
diff --cc packages/js2-mode/.travis.yml
index 000000000,bb0a9e077..bb0a9e077
mode 000000,100644..100644
--- a/packages/js2-mode/.travis.yml
+++ b/packages/js2-mode/.travis.yml
diff --cc packages/js2-mode/Makefile
index 000000000,f86786fb8..f86786fb8
mode 000000,100644..100644
--- a/packages/js2-mode/Makefile
+++ b/packages/js2-mode/Makefile
diff --cc packages/js2-mode/README.md
index 000000000,9065cdfe3..9065cdfe3
mode 000000,100644..100644
--- a/packages/js2-mode/README.md
+++ b/packages/js2-mode/README.md
diff --cc packages/js2-mode/tests/externs.el
index 000000000,7860058d4..7860058d4
mode 000000,100644..100644
--- a/packages/js2-mode/tests/externs.el
+++ b/packages/js2-mode/tests/externs.el
diff --cc packages/js2-mode/tests/indent.el
index 000000000,953b8a6c4..953b8a6c4
mode 000000,100644..100644
--- a/packages/js2-mode/tests/indent.el
+++ b/packages/js2-mode/tests/indent.el
diff --cc packages/js2-mode/tests/parser.el
index 000000000,3c05c4b5e..3c05c4b5e
mode 000000,100644..100644
--- a/packages/js2-mode/tests/parser.el
+++ b/packages/js2-mode/tests/parser.el