Evan Chan 1107b4d55b Merge branch 'master' into 2013-06/assembly-jar-deploy ... Conflicts: run Previous changes that I made to run and set-dev-classpath.sh instead have been folded into compute-classpath.sh		2013-06-28 17:18:35 -07:00
..
project	Use new layout for plugins definitions (recommended for SBT 0.11)	2011-09-26 22:32:05 +01:00
build.properties	Fix tests from different projects running in parallel in SBT 0.12	2013-04-11 22:29:37 -04:00
plugins.sbt	Fix some dependency issues in SBT build (same will be needed for Maven):	2013-06-20 18:44:46 +02:00
SparkBuild.scala	Merge branch 'master' into 2013-06/assembly-jar-deploy	2013-06-28 17:18:35 -07:00