summaryrefslogtreecommitdiff
path: root/doc/LICENSE.md
diff options
context:
space:
mode:
authorSeth Tisue <seth@tisue.net>2016-02-04 09:09:31 -0500
committerSeth Tisue <seth@tisue.net>2016-02-04 09:09:31 -0500
commit42525ec8d072cdd79d3916c09baa063b34a71f25 (patch)
treea04941a92dcfb7fc7ca736b656ef542abfe90722 /doc/LICENSE.md
parentcc6fea6d30609b8879db1ecdbc288e4cdaa5b8d4 (diff)
parent310f4d0537a47cfd177cf290479fadc54d7a27a6 (diff)
downloadscala-42525ec8d072cdd79d3916c09baa063b34a71f25.tar.gz
scala-42525ec8d072cdd79d3916c09baa063b34a71f25.tar.bz2
scala-42525ec8d072cdd79d3916c09baa063b34a71f25.zip
Merge pull request #4942 from SethTisue/copyright-2016
bump copyright year to 2016
Diffstat (limited to 'doc/LICENSE.md')
-rw-r--r--doc/LICENSE.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/LICENSE.md b/doc/LICENSE.md
index 55e82f64ba..b16711896c 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-2015 EPFL
+Copyright (c) 2002-2016 EPFL
-Copyright (c) 2011-2015 Typesafe, Inc.
+Copyright (c) 2011-2016 Typesafe, Inc.
All rights reserved.