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 /test/debug/OBSOLETE | |
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 'test/debug/OBSOLETE')
0 files changed, 0 insertions, 0 deletions