diff options
| author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2013-10-16 15:51:48 +0200 |
|---|---|---|
| committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2013-10-16 15:51:48 +0200 |
| commit | cd0f48c9567e9e52378c9c4c9b28e892bb2461a9 (patch) | |
| tree | c3cfa4b876c1ccd4a3766b3a32a2c54a727be7ab /test/files/jvm | |
| parent | ae47ccc35bdcfbdb965e2297b131a2416495d4e7 (diff) | |
| parent | e20f9e9f1fcf2a25603b2b75528e4d9395557411 (diff) | |
| download | scala-cd0f48c9567e9e52378c9c4c9b28e892bb2461a9.tar.gz scala-cd0f48c9567e9e52378c9c4c9b28e892bb2461a9.tar.bz2 scala-cd0f48c9567e9e52378c9c4c9b28e892bb2461a9.zip | |
Merge remote-tracking branch 'scala/2.10.x' into merge-2.10.x
Conflicts:
build.number
test/files/neg/classmanifests_new_deprecations.check
Diffstat (limited to 'test/files/jvm')
| -rw-r--r-- | test/files/jvm/deprecation.check | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/jvm/deprecation.check b/test/files/jvm/deprecation.check index e263e4909d..d116778d3f 100644 --- a/test/files/jvm/deprecation.check +++ b/test/files/jvm/deprecation.check @@ -1,3 +1,3 @@ -warning: there were 5 deprecation warning(s); re-run with -deprecation for details +warning: there were 4 deprecation warning(s); re-run with -deprecation for details Note: deprecation/Use_2.java uses or overrides a deprecated API. Note: Recompile with -Xlint:deprecation for details. |