diff options
| author | Lukas Rytz <lukas.rytz@typesafe.com> | 2016-01-25 19:49:52 +0100 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@typesafe.com> | 2016-01-25 19:49:52 +0100 |
| commit | 7604ccbf12f52a4091a98ba74040cf11e476053e (patch) | |
| tree | 65669093d92d1bcdf78414dab9edcb2979376982 | |
| parent | c06aed997f5a0c98434d7cec0ebe5f0da3de790e (diff) | |
| parent | de2db63d3bfa2582272dda1d067e43aad58bcfce (diff) | |
| download | scala-7604ccbf12f52a4091a98ba74040cf11e476053e.tar.gz scala-7604ccbf12f52a4091a98ba74040cf11e476053e.tar.bz2 scala-7604ccbf12f52a4091a98ba74040cf11e476053e.zip | |
Merge pull request #4918 from raboof/patch-1
Link 'Future' scaladoc to 'Futures and Promises'
| -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 294ca2aa48..ebc1e76ca1 100644 --- a/src/library/scala/concurrent/Future.scala +++ b/src/library/scala/concurrent/Future.scala @@ -43,6 +43,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. |