diff options
| author | Seth Tisue <seth@tisue.net> | 2017-03-06 10:31:22 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-06 10:31:22 -0800 |
| commit | 828a8923c4f1c6c6c884a18675e2effa91c73197 (patch) | |
| tree | 44b97739049ba908e26f6cf7e0451a4dee82368e /doc | |
| parent | 3f437a2aa448907ca608a1b68a9e71e5221c4632 (diff) | |
| parent | c2c37acd928f9b8f8a1d208ee9ee6135b54a1fcd (diff) | |
| download | scala-828a8923c4f1c6c6c884a18675e2effa91c73197.tar.gz scala-828a8923c4f1c6c6c884a18675e2effa91c73197.tar.bz2 scala-828a8923c4f1c6c6c884a18675e2effa91c73197.zip | |
Merge pull request #5753 from Philippus/issue/copyright_year
bump copyright year to 2017 [ci: last-only]
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 c56b38daa2..ce29d7e7d4 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-2016 EPFL +Copyright (c) 2002-2017 EPFL -Copyright (c) 2011-2016 Lightbend, Inc. +Copyright (c) 2011-2017 Lightbend, Inc. All rights reserved. diff --git a/doc/License.rtf b/doc/License.rtf index c8f24838a2..adc7dfdcb8 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:\ |