summaryrefslogtreecommitdiff
path: root/test/build-partest.xml
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2013-05-16 22:30:24 -0700
committerPaul Phillips <paulp@improving.org>2013-05-16 22:34:16 -0700
commit0c3ca2248d55eeeee2db6693e5fc46b9ba049eda (patch)
tree71686d0b99fc1d4a245ddb24efe50398b0c00c78 /test/build-partest.xml
parentc663ecf8677eda3fe8c91170b614eb7166b18711 (diff)
parent13b4628aabb8e7a293a382dcab6db5848f672f94 (diff)
downloadscala-0c3ca2248d55eeeee2db6693e5fc46b9ba049eda.tar.gz
scala-0c3ca2248d55eeeee2db6693e5fc46b9ba049eda.tar.bz2
scala-0c3ca2248d55eeeee2db6693e5fc46b9ba049eda.zip
Merge branch 'master' into HEAD
* master: SI-7469 Remove @deprecated scala.util.logging SI-3943 Test case for already-fixed Java interop bug Fix formatting for couple of docs in the compiler SI-7476 Add documentation to GenericTraversableTemplate SI-7469 Remove @deprecated scala.util.parsing.ast SI-7469 Remove @deprecated MurmurHash elements SI-7469 Remove deprecated elements in s.u.parsing.combinator SI-7469 Make @deprecated elems in scala.concurrent private[scala] removes duplication in inferImplicitValue SI-7047 fixes silent for c.inferImplicitXXX SI-7167 implicit macros decide what is divergence macroExpandAll is now triggered in all invocations of typed SI-5923 instantiates targs in deferred macro applications SI-6406 Restore deprecated API SI-6039 Harden against irrelevant filesystem details Limit unnecessary calls to Type#toString. fix typo in comment SI-7432 add testcases SI-7432 Range.min should throw NoSuchElementException on empty range AbstractFile.getDirectory does not return null when outDir is "." Conflicts: src/compiler/scala/tools/nsc/typechecker/Typers.scala
Diffstat (limited to 'test/build-partest.xml')
0 files changed, 0 insertions, 0 deletions