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

c76bbb50 · Kristofer Rye · a79b0820 · 6604167d · c76bbb50
Commit c76bbb50 authored Nov 27, 2013 by Kristofer Rye
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

Scala.gitignore Scala.gitignore +1 -0

No files found.
--- a/Scala.gitignore
+++ b/Scala.gitignore
@@ -14,3 +14,4 @@ project/plugins/project/

 # Scala-IDE specific
 .scala_dependencies
+.worksheet