diff options
| author | Adriaan Moors <adriaan@lightbend.com> | 2017-04-07 16:35:46 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan@lightbend.com> | 2017-04-07 16:35:46 -0700 |
| commit | cadb005bf775930f431efd50e6bd062614e0ef24 (patch) | |
| tree | 9890b120e898f1f1a6cb185002b9e7ac3a2ad506 /project | |
| parent | 15123a1b0bb5ac8b4668a9db754e2502e1c0ba8b (diff) | |
| parent | 828a8923c4f1c6c6c884a18675e2effa91c73197 (diff) | |
| download | scala-cadb005bf775930f431efd50e6bd062614e0ef24.tar.gz scala-cadb005bf775930f431efd50e6bd062614e0ef24.tar.bz2 scala-cadb005bf775930f431efd50e6bd062614e0ef24.zip | |
Merge 2.11.x into 2.12.x
Include 828a892 Merge pull request #5753
Diffstat (limited to 'project')
| -rw-r--r-- | project/VersionUtil.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/project/VersionUtil.scala b/project/VersionUtil.scala index aacbc78329..2363708f1d 100644 --- a/project/VersionUtil.scala +++ b/project/VersionUtil.scala @@ -24,7 +24,7 @@ object VersionUtil { ) lazy val generatePropertiesFileSettings = Seq[Setting[_]]( - copyrightString := "Copyright 2002-2016, LAMP/EPFL and Lightbend, Inc.", + copyrightString := "Copyright 2002-2017, LAMP/EPFL and Lightbend, Inc.", resourceGenerators in Compile += generateVersionPropertiesFile.map(file => Seq(file)).taskValue, generateVersionPropertiesFile := generateVersionPropertiesFileImpl.value ) |