summaryrefslogtreecommitdiff
path: root/src/scalap
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan@lightbend.com>2017-04-07 16:35:46 -0700
committerAdriaan Moors <adriaan@lightbend.com>2017-04-07 16:35:46 -0700
commitcadb005bf775930f431efd50e6bd062614e0ef24 (patch)
tree9890b120e898f1f1a6cb185002b9e7ac3a2ad506 /src/scalap
parent15123a1b0bb5ac8b4668a9db754e2502e1c0ba8b (diff)
parent828a8923c4f1c6c6c884a18675e2effa91c73197 (diff)
downloadscala-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 'src/scalap')
-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