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

This commit is contained in:
Kristofer Rye 2013-11-26 22:59:01 -05:00
commit c76bbb50c0

View File

@ -14,3 +14,4 @@ project/plugins/project/
# Scala-IDE specific
.scala_dependencies
.worksheet