summaryrefslogtreecommitdiff
path: root/src/scalap/decoder.properties
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan@lightbend.com>2017-04-08 10:13:21 -0700
committerGitHub <noreply@github.com>2017-04-08 10:13:21 -0700
commit1ef37f0bc18be5ed2ca8c33c0ea1912eed5dac3e (patch)
tree504be1953b98540b72cf4932b66a1c1143f4f00a /src/scalap/decoder.properties
parent2261f3ef4f7b2e0d14b3c2463db5878029bc5d8e (diff)
parent0d88720aea13c3a1f136f0caa7346eefe64610ec (diff)
downloadscala-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 'src/scalap/decoder.properties')
-rw-r--r--src/scalap/decoder.properties2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/scalap/decoder.properties b/src/scalap/decoder.properties
index 9bb8d130ea..0bff4c81d4 100644
--- a/src/scalap/decoder.properties
+++ b/src/scalap/decoder.properties
@@ -1,2 +1,2 @@
version.number=2.0.1
-copyright.string=(c) 2002-2016 LAMP/EPFL
+copyright.string=(c) 2002-2017 LAMP/EPFL