diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2016-02-03 22:06:42 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2016-02-04 09:19:19 +1000 |
| commit | da46355a90442636ee7634c31a69eae8e8b9cd42 (patch) | |
| tree | eec9abbf057e3c5fd4566df6628f9693835cc536 /src/library/scala/concurrent | |
| parent | 74e53cb4930fc3e02222d8be0f065ce8aaa71230 (diff) | |
| parent | cc6fea6d30609b8879db1ecdbc288e4cdaa5b8d4 (diff) | |
| download | scala-da46355a90442636ee7634c31a69eae8e8b9cd42.tar.gz scala-da46355a90442636ee7634c31a69eae8e8b9cd42.tar.bz2 scala-da46355a90442636ee7634c31a69eae8e8b9cd42.zip | |
Merge commit 'cc6fea6' into merge/2.11.x-to-2.12.x-20160203
Conflicts:
build.sbt
scripts/jobs/integrate/bootstrap
Diffstat (limited to 'src/library/scala/concurrent')
| -rw-r--r-- | src/library/scala/concurrent/Future.scala | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/library/scala/concurrent/Future.scala b/src/library/scala/concurrent/Future.scala index f49536d351..e67e698a5c 100644 --- a/src/library/scala/concurrent/Future.scala +++ b/src/library/scala/concurrent/Future.scala @@ -36,6 +36,8 @@ import scala.reflect.ClassTag * * @author Philipp Haller, Heather Miller, Aleksandar Prokopec, Viktor Klang * + * @see [[http://docs.scala-lang.org/overviews/core/futures.html Futures and Promises]] + * * @define multipleCallbacks * Multiple callbacks may be registered; there is no guarantee that they will be * executed in a particular order. |