summaryrefslogtreecommitdiff
path: root/src/jline/project/build.properties
diff options
context:
space:
mode:
authorAntonio Cunei <antonio.cunei@epfl.ch>2011-04-20 12:19:47 +0000
committerAntonio Cunei <antonio.cunei@epfl.ch>2011-04-20 12:19:47 +0000
commit517acfdd56af4562d3c4f2963f656f2834ca23e2 (patch)
tree609c95d6aafff786460300162991ce5b31fe8c32 /src/jline/project/build.properties
parente5ad9c55f8a7a97aa7c36a057078db2031f468e8 (diff)
downloadscala-517acfdd56af4562d3c4f2963f656f2834ca23e2.tar.gz
scala-517acfdd56af4562d3c4f2963f656f2834ca23e2.tar.bz2
scala-517acfdd56af4562d3c4f2963f656f2834ca23e2.zip
Fixing an incomplete svnmerge; second, merge ag...
Fixing an incomplete svnmerge; second, merge again from trunk.
Diffstat (limited to 'src/jline/project/build.properties')
-rw-r--r--src/jline/project/build.properties4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/jline/project/build.properties b/src/jline/project/build.properties
index 3ecffcd808..89d3b4a498 100644
--- a/src/jline/project/build.properties
+++ b/src/jline/project/build.properties
@@ -1,8 +1,8 @@
#Project properties
+#Wed Mar 23 21:05:24 PDT 2011
project.organization=org.improving
project.name=jline
-sbt.version=0.7.5.RC0
+sbt.version=0.7.6.RC0
project.version=0.98
build.scala.versions=2.8.1
-/*build.scala.versions=2.9.0-SNAPSHOT*/
project.initialize=false