Merge branch 'master' into add-common-linux-compile-file-extensions

rye · rye · commit c76bbb50c05c · 2013-11-26T22:59:01.000-05:00
diff --git a/Scala.gitignore b/Scala.gitignore
@@ -14,3 +14,4 @@ project/plugins/project/
 
 # Scala-IDE specific
 .scala_dependencies
+.worksheet
