diff options
author | Seth Tisue <seth@tisue.net> | 2016-02-04 09:09:31 -0500 |
---|---|---|
committer | Seth Tisue <seth@tisue.net> | 2016-02-04 09:09:31 -0500 |
commit | 42525ec8d072cdd79d3916c09baa063b34a71f25 (patch) | |
tree | a04941a92dcfb7fc7ca736b656ef542abfe90722 /doc/License.rtf | |
parent | cc6fea6d30609b8879db1ecdbc288e4cdaa5b8d4 (diff) | |
parent | 310f4d0537a47cfd177cf290479fadc54d7a27a6 (diff) | |
download | scala-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.rtf')
-rw-r--r-- | doc/License.rtf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/License.rtf b/doc/License.rtf index c475bda3ef..21beba0e9f 100644 --- a/doc/License.rtf +++ b/doc/License.rtf @@ -10,8 +10,8 @@ \fs48 Scala License \fs40 \ -\fs26 Copyright (c) 2002-2015 EPFL\ -Copyright (c) 2011-2015 Typesafe, Inc.\ +\fs26 Copyright (c) 2002-2016 EPFL\ +Copyright (c) 2011-2016 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:\ |