diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-04-02 08:55:31 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-04-02 09:10:01 -0700 |
| commit | f4814f06bd9f6f1f07a5e97ed45a4b6c810e038a (patch) | |
| tree | 9e4d3a349377c166089618a13d2711a67c6718f2 /starr.number | |
| parent | c77dd12d8d1041af0b9f79c19a03eb34d34a9327 (diff) | |
| parent | 92a17850f18a5d457e79be7e83bcb0567fe72e54 (diff) | |
| download | scala-f4814f06bd9f6f1f07a5e97ed45a4b6c810e038a.tar.gz scala-f4814f06bd9f6f1f07a5e97ed45a4b6c810e038a.tar.bz2 scala-f4814f06bd9f6f1f07a5e97ed45a4b6c810e038a.zip | |
Merge 2.10.x into master
Conflicts:
build.xml
Diffstat (limited to 'starr.number')
| -rw-r--r-- | starr.number | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/starr.number b/starr.number index 7e6e869eaf..89659fcbf3 100644 --- a/starr.number +++ b/starr.number @@ -1 +1 @@ -starr.version=2.10.1
\ No newline at end of file +starr.version=2.11.0-M2
\ No newline at end of file |