summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorSeth Tisue <seth@tisue.net>2015-07-13 16:02:50 -0400
committerSeth Tisue <seth@tisue.net>2015-07-17 13:05:16 -0400
commite0aac7c9ef6d25a3283d3afe386c8d7da16ca941 (patch)
treec31b3e24ab954784fedb6f14931f225f3f0fd1cd /doc
parentf2e055f251d8c7169e8a84246d62d923fbcc8524 (diff)
downloadscala-e0aac7c9ef6d25a3283d3afe386c8d7da16ca941.tar.gz
scala-e0aac7c9ef6d25a3283d3afe386c8d7da16ca941.tar.bz2
scala-e0aac7c9ef6d25a3283d3afe386c8d7da16ca941.zip
bump copyright year to 2015
(just hitting the highlights here, not worrying yet about bumping the dates in every modified source file)
Diffstat (limited to 'doc')
-rw-r--r--doc/LICENSE.md4
-rw-r--r--doc/License.rtf4
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/LICENSE.md b/doc/LICENSE.md
index 6b039afd68..55e82f64ba 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-2013 EPFL
+Copyright (c) 2002-2015 EPFL
-Copyright (c) 2011-2013 Typesafe, Inc.
+Copyright (c) 2011-2015 Typesafe, Inc.
All rights reserved.
diff --git a/doc/License.rtf b/doc/License.rtf
index 62ec2d023c..c475bda3ef 100644
--- a/doc/License.rtf
+++ b/doc/License.rtf
@@ -10,8 +10,8 @@
\fs48 Scala License
\fs40 \
-\fs26 Copyright (c) 2002-2013 EPFL\
-Copyright (c) 2011-2013 Typesafe, Inc.\
+\fs26 Copyright (c) 2002-2015 EPFL\
+Copyright (c) 2011-2015 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:\