diff options
author | Paul Phillips <paulp@improving.org> | 2013-02-23 04:46:26 -0800 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2013-02-23 05:47:37 -0800 |
commit | ed2a0ac9a169b13a10cb4eed0a5a5b3904766ec5 (patch) | |
tree | bd21f50f57c8aa7a1ce76bca2fc3469937ee4c41 /.mailmap | |
parent | 6e2f0fa09dc7f264865433865238661657facf09 (diff) | |
parent | 88b2915790a6a2ccfa490de6e36aa355148a42b2 (diff) | |
download | scala-ed2a0ac9a169b13a10cb4eed0a5a5b3904766ec5.tar.gz scala-ed2a0ac9a169b13a10cb4eed0a5a5b3904766ec5.tar.bz2 scala-ed2a0ac9a169b13a10cb4eed0a5a5b3904766ec5.zip |
Merge remote-tracking branch 'origin/2.10.x' into master
* origin/2.10.x:
SI-7171 Consider prefix when assessing type finality.
please ant with filenames, add comments
Fixed error in reflection API docs about linearization order on method baseClasses
Shadowed Implict typo (fixes no issue)
remove unused imports
Conflicts:
src/reflect/scala/reflect/internal/Types.scala
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions