diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2015-01-29 10:29:33 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2015-01-29 10:29:33 +1000 |
| commit | 8b334459d0e09cf486b12ea6869ddc2f2a9eb6a6 (patch) | |
| tree | 9b91ee264a8a4abf936b4b2c939591decb751313 /test/files/res/t9089/A.scala | |
| parent | 020581e795a677b838fa62f67064fe9a55b02ba0 (diff) | |
| parent | 7b5998a0592ee707c02a13859fe1520687c76c38 (diff) | |
| download | scala-8b334459d0e09cf486b12ea6869ddc2f2a9eb6a6.tar.gz scala-8b334459d0e09cf486b12ea6869ddc2f2a9eb6a6.tar.bz2 scala-8b334459d0e09cf486b12ea6869ddc2f2a9eb6a6.zip | |
Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-20150129
Conflicts:
build.number
src/library/scala/concurrent/Future.scala
versions.properties
Diffstat (limited to 'test/files/res/t9089/A.scala')
| -rw-r--r-- | test/files/res/t9089/A.scala | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test/files/res/t9089/A.scala b/test/files/res/t9089/A.scala new file mode 100644 index 0000000000..bccf269639 --- /dev/null +++ b/test/files/res/t9089/A.scala @@ -0,0 +1 @@ +object O { def f(x: => Int): Int = x } |