diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2016-03-14 11:45:27 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2016-03-14 11:45:27 -0700 |
| commit | cbba68fb6085f238097fbf1635046051bd7c6889 (patch) | |
| tree | c2ad5795f1fc7935a543018854264d3f431df2cd /doc | |
| parent | 067a4d36a6d30d6431a520c9db8ec4714f1a8675 (diff) | |
| parent | 1706a37eb84ec252aea77bccebad3e48448534ad (diff) | |
| download | scala-cbba68fb6085f238097fbf1635046051bd7c6889.tar.gz scala-cbba68fb6085f238097fbf1635046051bd7c6889.tar.bz2 scala-cbba68fb6085f238097fbf1635046051bd7c6889.zip | |
Merge 2.11.x into 2.12.x
Resolved conflicts as in b0e05b67c7
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/LICENSE.md | 2 | ||||
| -rw-r--r-- | doc/License.rtf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/LICENSE.md b/doc/LICENSE.md index ee61d11b8b..a07ba32e0b 100644 --- a/doc/LICENSE.md +++ b/doc/LICENSE.md @@ -4,7 +4,7 @@ Scala is licensed under the [BSD 3-Clause License](http://opensource.org/license Copyright (c) 2002-2016 EPFL -Copyright (c) 2011-2016 Lightbend, Inc. (formerly Typesafe, Inc.) +Copyright (c) 2011-2016 Lightbend, Inc. All rights reserved. diff --git a/doc/License.rtf b/doc/License.rtf index 407700f8dd..5c26d787a0 100644 --- a/doc/License.rtf +++ b/doc/License.rtf @@ -11,7 +11,7 @@ \fs40 \ \fs26 Copyright (c) 2002-2016 EPFL\ -Copyright (c) 2011-2016 Lightbend, Inc. (formerly Typesafe, Inc.)\ +Copyright (c) 2011-2016 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:\ |