summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | Merge pull request #3721 from lrytz/t7852Jason Zaugg2014-05-085-23/+39
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | BCodeICodeCommon through composition rather than inheritanceLukas Rytz2014-05-084-4/+9
| * | | | | | | | | | SI-7852 for GenBCodeLukas Rytz2014-05-075-24/+35
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #3728 from retronym/topic/merge-2.10.xJason Zaugg2014-05-0816-12/+168
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge commit 'ec05aeb' into topic/merge-2.10.xJason Zaugg2014-05-0812-8/+99
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge pull request #3678 from retronym/ticket/8479Jason Zaugg2014-04-075-4/+49
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | SI-8479 Fix constructor default args under scaladocJason Zaugg2014-04-075-4/+49
| | * | | | | | | | | | | Merge pull request #3655 from retronym/ticket/8442Grzegorz Kossakowski2014-03-267-4/+50
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | SI-8442 Ignore stub annotation symbols in `AnnotationInfo#matches`Jason Zaugg2014-03-257-4/+50
| | | |/ / / / / / / / / /
| | * | | | | | | | | | | Merge pull request #3551 from xeno-by/topic/typecheck-member-defJason Zaugg2014-03-256-62/+100
| | |\ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ Merge commit '3314d76' into topic/merge-2.10.xJason Zaugg2014-05-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | [nomaster] typecheck(q"class C") no longer crashesEugene Burmako2014-03-236-62/+100
| * | | | | | | | | | | | | Merge commit '876590b' into topic/merge-2.10.xJason Zaugg2014-05-084-4/+69
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| | * | | | | | | | | | | Merge pull request #3614 from retronym/ticket/8196Jason Zaugg2014-03-254-4/+66
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | SI-8195 Test case to show this is a dup of SI-8196Jason Zaugg2014-03-111-2/+23
| | | * | | | | | | | | | | SI-8196 Runtime reflection robustness for STATIC impl detailsJason Zaugg2014-03-114-4/+45
| | | | |/ / / / / / / / / | | | |/| | | | | | | | |
* | | | | | | | | | | | | Merge pull request #3725 from gkossakowski/fastTrack-compositionGrzegorz Kossakowski2014-05-082-4/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Refactor FastTrack to use composition instead of inheritance.Grzegorz Kossakowski2014-05-072-4/+9
* | | | | | | | | | | | | Merge pull request #3724 from gkossakowski/classpath-doLoadGrzegorz Kossakowski2014-05-083-11/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Get rid of Platform.doLoad method.Grzegorz Kossakowski2014-05-073-11/+1
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #3723 from gkossakowski/partest-eclipse-projectGrzegorz Kossakowski2014-05-071-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Make partest to depend on Scala compiler Eclipse project.Grzegorz Kossakowski2014-05-071-3/+3
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #3717 from retronym/topic/mimaGrzegorz Kossakowski2014-05-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Use 2.11.0 as the MiMa baseline for 2.11.xJason Zaugg2014-05-071-1/+1
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #3718 from lrytz/partestArgsLukas Rytz2014-05-0713-3/+14
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Respect -Dpartest.scalac_opts when running the test suite through ANTLukas Rytz2014-05-0713-3/+14
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #3686 from densh/topic/re-enabled-typechecked-typesJason Zaugg2014-05-021-5/+4
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Re-enable typechecked types part of quasiquote test suiteDenys Shabalin2014-04-201-5/+4
* | | | | | | | | | Merge pull request #3708 from lrytz/intellijJason Zaugg2014-05-0218-72/+188
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | IntelliJ project filesLukas Rytz2014-05-0218-72/+188
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge pull request #3702 from gkossakowski/undoPairsGrzegorz Kossakowski2014-04-271-3/+10
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Use named class for UndoPair.Grzegorz Kossakowski2014-04-251-3/+10
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #3698 from adriaanm/scaladoc-sourcelinkGrzegorz Kossakowski2014-04-251-2/+34
|\ \ \ \ \ \ \ \
| * | | | | | | | Restore linking to source from scaladoc.Adriaan Moors2014-04-241-2/+34
|/ / / / / / / /
* | | | | | | | Merge pull request #3694 from retronym/ticket/8478-2Jason Zaugg2014-04-241-2/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | SI-8478 Fix a performance regression in subtypingJason Zaugg2014-04-231-2/+2
|/ / / / / / /
* | | | | | | Merge pull request #3688 from retronym/topic/continuations-cross-version-stri...Jason Zaugg2014-04-221-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Another spot to fully cross version continuations pluginJason Zaugg2014-04-211-0/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #3635 from retronym/ticket/8329Jason Zaugg2014-04-212-13/+41
|\ \ \ \ \ \ \
| * | | | | | | SI-8329 Better hygiene for patmat partial functionsJason Zaugg2014-03-152-13/+41
* | | | | | | | Merge pull request #3670 from retronym/ticket/8463Jason Zaugg2014-04-213-1/+52
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | SI-8463 Avoid unpositioned errors from search for viewsJason Zaugg2014-04-023-1/+52
* | | | | | | | Merge pull request #3685 from VladUreche/issue/8514-masterJason Zaugg2014-04-213-3/+24
|\ \ \ \ \ \ \ \
| * | | | | | | | SI-8514 Remove scaladoc html inconsistenciesVlad Ureche2014-04-183-3/+24
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #3687 from smarter/fix_analysisBudget_offJason Zaugg2014-04-211-2/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | SI-8520 Fix -Dscalac.patmat.analysisBudget=offGuillaume Martres2014-04-211-2/+9
| |/ / / / / / /
* | | | | | | | Merge pull request #3682 from retronym/ticket/8497Jason Zaugg2014-04-213-15/+30
|\ \ \ \ \ \ \ \
| * | | | | | | | SI-8497 Fix regression in pickling of AnnotatedTypesJason Zaugg2014-04-143-15/+30
* | | | | | | | | Merge pull request #3618 from mkubala/SI-8144Jason Zaugg2014-04-219-53/+247
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | SI-8144 permalinks in scaladocMarcin Kubala2014-03-149-53/+247