diff options
| author | Adriaan Moors <adriaan@lightbend.com> | 2017-04-08 10:13:21 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-08 10:13:21 -0700 |
| commit | 1ef37f0bc18be5ed2ca8c33c0ea1912eed5dac3e (patch) | |
| tree | 504be1953b98540b72cf4932b66a1c1143f4f00a /project/VersionUtil.scala | |
| parent | 2261f3ef4f7b2e0d14b3c2463db5878029bc5d8e (diff) | |
| parent | 0d88720aea13c3a1f136f0caa7346eefe64610ec (diff) | |
| download | scala-1ef37f0bc18be5ed2ca8c33c0ea1912eed5dac3e.tar.gz scala-1ef37f0bc18be5ed2ca8c33c0ea1912eed5dac3e.tar.bz2 scala-1ef37f0bc18be5ed2ca8c33c0ea1912eed5dac3e.zip | |
Merge pull request #5837 from adriaanm/merge-2.11.x-into-2.12.x
Catch up with 2.11.x
Diffstat (limited to 'project/VersionUtil.scala')
| -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 ) |