diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2016-02-10 12:56:14 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2016-02-10 12:56:14 +1000 |
| commit | fca51b24115ad17a26a144b394a18471ea356155 (patch) | |
| tree | 28517374ed747afa892f4bcae09e92d5d4dd20f9 /doc/License.rtf | |
| parent | b0beb720e70cc8700a593766ad6c384e8826bf52 (diff) | |
| parent | 8f8f81b72ef07140952aeb76120bd032e35cc918 (diff) | |
| download | scala-fca51b24115ad17a26a144b394a18471ea356155.tar.gz scala-fca51b24115ad17a26a144b394a18471ea356155.tar.bz2 scala-fca51b24115ad17a26a144b394a18471ea356155.zip | |
Merge branch '2.11.x' into topic/merge-2.11.x-to-2.12.x-20160210
Conflicts:
src/library/scala/collection/Iterator.scala
|
`-- trivial conflicts only. Parens were added to the
next() calls in 2.12.x, while in the meantime
`{Concat,Join}Iterator` were optimized in 2.11.x
Diffstat (limited to 'doc/License.rtf')
| -rw-r--r-- | doc/License.rtf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/License.rtf b/doc/License.rtf index d2f37a4bf9..f2258077fa 100644 --- a/doc/License.rtf +++ b/doc/License.rtf @@ -10,8 +10,8 @@ \fs48 Scala License \fs40 \ -\fs26 Copyright (c) 2002-2015 EPFL\ -Copyright (c) 2011-2015 Typesafe, Inc.\ +\fs26 Copyright (c) 2002-2016 EPFL\ +Copyright (c) 2011-2016 Typesafe, Inc.\ All rights reserved.\ \ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:\ |