diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2016-02-10 12:56:14 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2016-02-10 12:56:14 +1000 |
| commit | fca51b24115ad17a26a144b394a18471ea356155 (patch) | |
| tree | 28517374ed747afa892f4bcae09e92d5d4dd20f9 /src/scalap | |
| parent | b0beb720e70cc8700a593766ad6c384e8826bf52 (diff) | |
| parent | 8f8f81b72ef07140952aeb76120bd032e35cc918 (diff) | |
| download | scala-fca51b24115ad17a26a144b394a18471ea356155.tar.gz scala-fca51b24115ad17a26a144b394a18471ea356155.tar.bz2 scala-fca51b24115ad17a26a144b394a18471ea356155.zip | |
Merge branch '2.11.x' into topic/merge-2.11.x-to-2.12.x-20160210
Conflicts:
src/library/scala/collection/Iterator.scala
|
`-- trivial conflicts only. Parens were added to the
next() calls in 2.12.x, while in the meantime
`{Concat,Join}Iterator` were optimized in 2.11.x
Diffstat (limited to 'src/scalap')
| -rw-r--r-- | src/scalap/decoder.properties | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/scalap/decoder.properties b/src/scalap/decoder.properties index 333f6ce715..9bb8d130ea 100644 --- a/src/scalap/decoder.properties +++ b/src/scalap/decoder.properties @@ -1,2 +1,2 @@ version.number=2.0.1 -copyright.string=(c) 2002-2015 LAMP/EPFL +copyright.string=(c) 2002-2016 LAMP/EPFL |