Merge remote-tracking branch 'upstream/update'

jkinkead · Dec 28, 2015 · e90c7e9 · e90c7e9
2 parents ebb40ce + 23dc872
commit e90c7e9
Show file tree

Hide file tree

Showing 129 changed files with 381 additions and 1,636 deletions.
diff --git a/.ensime b/.ensime
diff --git a/.gitignore b/.gitignore
@@ -14,8 +14,11 @@ corpusscan/target/
 corpusscan/lib_managed/
 corpusscan/src_managed/
 docs/build
-.settings
 nohup.out
 .history
 .cache
-.idea/
+.idea/
+.settings
+.classpath
+.project
+.cache*
diff --git a/README.rst b/README.rst
@@ -57,7 +57,7 @@ Usage within a project
 
 Have a use for the scalariform source code directly? You can use it as a build dependency: ::
 
-    "org.scalariform" %% "scalariform" % "0.1.8"
+    "org.scalariform" %% "scalariform" % "0.2.0"
 
 Integration with Eclipse
 ------------------------

diff --git a/cli/.classpath b/cli/.classpath
diff --git a/cli/.project b/cli/.project
diff --git a/...commandline/CommandLineOptionParser.scala → ...commandline/CommandLineOptionParser.scala b/...commandline/CommandLineOptionParser.scala → ...commandline/CommandLineOptionParser.scala
@@ -1,6 +1,5 @@
 package scalariform.commandline
 
-import scala.util.parsing.input._
 import scala.util.parsing.combinator._
 
 class CommandLineOptionParser extends RegexParsers {

diff --git a/...ltrinh/scalariform/commandline/Main.scala → .../scala/scalariform/commandline/Main.scala b/...ltrinh/scalariform/commandline/Main.scala → .../scala/scalariform/commandline/Main.scala
diff --git a/...ariform/commandline/ScalaFileWalker.scala → ...ariform/commandline/ScalaFileWalker.scala b/...ariform/commandline/ScalaFileWalker.scala → ...ariform/commandline/ScalaFileWalker.scala
diff --git a/docs/Makefile b/docs/Makefile
diff --git a/docs/source/README.rst b/docs/source/README.rst
diff --git a/docs/source/conf.py b/docs/source/conf.py
diff --git a/misc/.classpath b/misc/.classpath
diff --git a/misc/.project b/misc/.project
diff --git a/...calariform/corpusscan/CorpusScanner.scala → ...calariform/corpusscan/CorpusScanner.scala b/...calariform/corpusscan/CorpusScanner.scala → ...calariform/corpusscan/CorpusScanner.scala