diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2015-02-24 10:35:34 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2015-02-24 10:35:34 +1000 |
| commit | 1a7f4ec0961ffcddd283d0c372443983a87833dc (patch) | |
| tree | 2bd9e4bbffc7d9e01c30332440a4cf461720b4b9 /test/pending | |
| parent | 5601a5b908c3714679824186e4a9e6423544cb84 (diff) | |
| parent | ad845ffc2347b289c9ad480de370b50aa4f91d9f (diff) | |
| download | scala-1a7f4ec0961ffcddd283d0c372443983a87833dc.tar.gz scala-1a7f4ec0961ffcddd283d0c372443983a87833dc.tar.bz2 scala-1a7f4ec0961ffcddd283d0c372443983a87833dc.zip | |
Merge commit 'ad845ff' into merge/2.10.x-to-2.11.x-20150224
Conflicts:
src/library/scala/concurrent/Promise.scala
test/files/jvm/future-spec/PromiseTests.scala
Diffstat (limited to 'test/pending')
0 files changed, 0 insertions, 0 deletions