diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2016-02-25 21:45:05 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2016-02-25 21:48:26 +1000 |
| commit | 964630ec1f4cf94f4d09eff394f959e733e3fcf7 (patch) | |
| tree | edbe21ff3fd89156701c8ecedf5d900915bfb759 /doc | |
| parent | d375334c26c625da345c5e77bca2975f21b8bd10 (diff) | |
| parent | e0fc92a2b7b27141b41cecafd3ec7804ad02707b (diff) | |
| download | scala-964630ec1f4cf94f4d09eff394f959e733e3fcf7.tar.gz scala-964630ec1f4cf94f4d09eff394f959e733e3fcf7.tar.bz2 scala-964630ec1f4cf94f4d09eff394f959e733e3fcf7.zip | |
Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-20160225
Conflicts:
scripts/jobs/integrate/bootstrap
src/build/maven/scala-actors-pom.xml
test/files/pos/t3420.flags
Conflicts were trivial to resolve.
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 dc557368cf..ee61d11b8b 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 Typesafe, Inc. +Copyright (c) 2011-2016 Lightbend, Inc. (formerly Typesafe, Inc.) All rights reserved. diff --git a/doc/License.rtf b/doc/License.rtf index f2258077fa..407700f8dd 100644 --- a/doc/License.rtf +++ b/doc/License.rtf @@ -11,7 +11,7 @@ \fs40 \ \fs26 Copyright (c) 2002-2016 EPFL\ -Copyright (c) 2011-2016 Typesafe, Inc.\ +Copyright (c) 2011-2016 Lightbend, Inc. (formerly 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:\ |