Skip to content
Snippets Groups Projects
Commit 7c77b2fa authored by Matei Zaharia's avatar Matei Zaharia
Browse files

Merge branch 'master' into scala-2.9 

Conflicts:
	project/build.properties
parents 1450fd74 c86af800
No related branches found
Tags 0.3-scala-2.9
No related merge requests found
Hide whitespace changes
Inline Side-by-side
project/build.properties
+ 1
− 1
View file @ 7c77b2fa
......@@ -3,6 +3,6 @@
project.organization=org.spark-project
project.name=spark
sbt.version=0.7.7
project.version=0.3-SNAPSHOT
project.version=0.3
build.scala.versions=2.9.0-1
project.initialize=false
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment