diff options
| author | Seth Tisue <seth@tisue.net> | 2016-02-24 16:56:11 -0500 |
|---|---|---|
| committer | Seth Tisue <seth@tisue.net> | 2016-02-24 16:56:11 -0500 |
| commit | e0fc92a2b7b27141b41cecafd3ec7804ad02707b (patch) | |
| tree | 6c71dccc37f42c425ec19b6f68854b4c230c9e51 /doc | |
| parent | f69d1e071578baafa5748a70c5f799756ae1c9fa (diff) | |
| parent | 9b74b414601d3abf9ef68a552b62bf24ba98bd1a (diff) | |
| download | scala-e0fc92a2b7b27141b41cecafd3ec7804ad02707b.tar.gz scala-e0fc92a2b7b27141b41cecafd3ec7804ad02707b.tar.bz2 scala-e0fc92a2b7b27141b41cecafd3ec7804ad02707b.zip | |
Merge pull request #4995 from SethTisue/typesafe-is-now-lightbend
Typesafe is now Lightbend
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 b16711896c..90bf842420 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 21beba0e9f..5e4403b69f 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:\ |