diff options
| author | Josh Suereth <joshua.suereth@gmail.com> | 2012-03-16 12:22:31 -0400 |
|---|---|---|
| committer | Josh Suereth <joshua.suereth@gmail.com> | 2012-03-16 12:22:31 -0400 |
| commit | 5877a9264d8a9eef4f8a8a149b227474710a8eb0 (patch) | |
| tree | 4c9c053af794690b83cee4afe6b33708324d872d /build.number | |
| parent | 1ca609715206679b41e72c012fa62641f4695175 (diff) | |
| download | scala-5877a9264d8a9eef4f8a8a149b227474710a8eb0.tar.gz scala-5877a9264d8a9eef4f8a8a149b227474710a8eb0.tar.bz2 scala-5877a9264d8a9eef4f8a8a149b227474710a8eb0.zip | |
Fixing merge conflicts for trunk.
Diffstat (limited to 'build.number')
| -rw-r--r-- | build.number | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build.number b/build.number index e5a19b9b7e..b5c4e61d13 100644 --- a/build.number +++ b/build.number @@ -1,7 +1,7 @@ #Tue Sep 11 19:21:09 CEST 2007 version.major=2 -version.minor=9 -version.patch=2 +version.minor=10 +version.patch=0 # This is the -N part of a version. if it's 0, it's dropped from maven versions. version.bnum=0 |