diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-08-05 10:57:07 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-08-05 10:57:07 -0700 |
| commit | effb1024af61ea0a2ee15ebd67d16e9e5c96f538 (patch) | |
| tree | 7f2d42febc15cb6689b35809aa5da2387293382a /doc | |
| parent | 462e22d2f25bb9432c5a1e7bf20f391e6424f7a9 (diff) | |
| parent | 4c6dcfe9341d2db47a0b0a567f5646fb9d573020 (diff) | |
| download | scala-effb1024af61ea0a2ee15ebd67d16e9e5c96f538.tar.gz scala-effb1024af61ea0a2ee15ebd67d16e9e5c96f538.tar.bz2 scala-effb1024af61ea0a2ee15ebd67d16e9e5c96f538.zip | |
Merge commit '4c6dcfe934' into 2.12.x
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/LICENSE.md | 4 | ||||
| -rw-r--r-- | doc/License.rtf | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/LICENSE.md b/doc/LICENSE.md index 6eab02548d..f38bf4c519 100644 --- a/doc/LICENSE.md +++ b/doc/LICENSE.md @@ -2,9 +2,9 @@ Scala is licensed under the [BSD 3-Clause License](http://opensource.org/license ## Scala License -Copyright (c) 2002-2013 EPFL +Copyright (c) 2002-2015 EPFL -Copyright (c) 2011-2013 Typesafe, Inc. +Copyright (c) 2011-2015 Typesafe, Inc. All rights reserved. diff --git a/doc/License.rtf b/doc/License.rtf index 541f4d7996..35ff645feb 100644 --- a/doc/License.rtf +++ b/doc/License.rtf @@ -10,8 +10,8 @@ \fs48 Scala License \fs40 \ -\fs26 Copyright (c) 2002-2013 EPFL\ -Copyright (c) 2011-2013 Typesafe, Inc.\ +\fs26 Copyright (c) 2002-2015 EPFL\ +Copyright (c) 2011-2015 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:\ |