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/scaladoc/scalacheck | |
| 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/scaladoc/scalacheck')
| -rw-r--r-- | test/scaladoc/scalacheck/HtmlFactoryTest.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/scaladoc/scalacheck/HtmlFactoryTest.scala b/test/scaladoc/scalacheck/HtmlFactoryTest.scala index fc190b188c..6b59355991 100644 --- a/test/scaladoc/scalacheck/HtmlFactoryTest.scala +++ b/test/scaladoc/scalacheck/HtmlFactoryTest.scala @@ -485,7 +485,7 @@ object Test extends Properties("HtmlFactory") { """, true), (Some("DerivedD"), """def function[T](arg1: T, arg2: String): Double - T The overriden type parameter comment + T The overridden type parameter comment arg1 The T term comment arg2 The string comment returns The return comment |