diff options
| author | Adriaan Moors <adriaan@lightbend.com> | 2017-04-08 10:13:21 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-08 10:13:21 -0700 |
| commit | 1ef37f0bc18be5ed2ca8c33c0ea1912eed5dac3e (patch) | |
| tree | 504be1953b98540b72cf4932b66a1c1143f4f00a /doc/License.rtf | |
| parent | 2261f3ef4f7b2e0d14b3c2463db5878029bc5d8e (diff) | |
| parent | 0d88720aea13c3a1f136f0caa7346eefe64610ec (diff) | |
| download | scala-1ef37f0bc18be5ed2ca8c33c0ea1912eed5dac3e.tar.gz scala-1ef37f0bc18be5ed2ca8c33c0ea1912eed5dac3e.tar.bz2 scala-1ef37f0bc18be5ed2ca8c33c0ea1912eed5dac3e.zip | |
Merge pull request #5837 from adriaanm/merge-2.11.x-into-2.12.x
Catch up with 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 5c26d787a0..4c460e2f28 100644 --- a/doc/License.rtf +++ b/doc/License.rtf @@ -10,8 +10,8 @@ \fs48 Scala License \fs40 \ -\fs26 Copyright (c) 2002-2016 EPFL\ -Copyright (c) 2011-2016 Lightbend, Inc.\ +\fs26 Copyright (c) 2002-2017 EPFL\ +Copyright (c) 2011-2017 Lightbend, 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:\ |