summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | Merge pull request #3721 from lrytz/t7852Jason Zaugg2014-05-084-22/+38
|\ \ \ \ \ \ \ \
| * | | | | | | | BCodeICodeCommon through composition rather than inheritanceLukas Rytz2014-05-084-4/+9
| * | | | | | | | SI-7852 for GenBCodeLukas Rytz2014-05-074-23/+34
| |/ / / / / / /
* | | | | | | | Merge pull request #3728 from retronym/topic/merge-2.10.xJason Zaugg2014-05-086-12/+31
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge commit 'ec05aeb' into topic/merge-2.10.xJason Zaugg2014-05-085-8/+24
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge pull request #3678 from retronym/ticket/8479Jason Zaugg2014-04-073-4/+16
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | SI-8479 Fix constructor default args under scaladocJason Zaugg2014-04-073-4/+16
| | * | | | | | | | | Merge pull request #3655 from retronym/ticket/8442Grzegorz Kossakowski2014-03-262-4/+8
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | SI-8442 Ignore stub annotation symbols in `AnnotationInfo#matches`Jason Zaugg2014-03-252-4/+8
| | | |/ / / / / / / /
| | * | | | | | | | | Merge pull request #3551 from xeno-by/topic/typecheck-member-defJason Zaugg2014-03-253-62/+68
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | [nomaster] typecheck(q"class C") no longer crashesEugene Burmako2014-03-233-62/+68
| * | | | | | | | | | | Merge commit '876590b' into topic/merge-2.10.xJason Zaugg2014-05-081-4/+7
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge pull request #3614 from retronym/ticket/8196Jason Zaugg2014-03-251-4/+7
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | SI-8196 Runtime reflection robustness for STATIC impl detailsJason Zaugg2014-03-111-4/+7
| | | | |/ / / / / / / / | | | |/| | | | | | | |
| | * | | | | | | | | | [backport] no longer warns on calls to vampire macrosEugene Burmako2014-03-051-1/+1
| | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | [backport] SI-7902 Fix spurious kind error due to an unitialized symbolJason Zaugg2014-02-091-1/+2
| | |/ / / / / / / /
| | * | | | | | | | [nomaster] corrects an error in reify’s documentationEugene Burmako2014-01-261-5/+5
| | * | | | | | | | Merge pull request #3359 from huitseeker/issue/VarianceAdaptationsJason Zaugg2014-01-216-6/+6
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Backports library changes related to SI-6566 from a419799François Garillot2014-01-136-6/+6
| | * | | | | | | | | Merge pull request #3367 from retronym/backport/3363Jason Zaugg2014-01-201-25/+10
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | [nomaster] SI-8146 Fix non-deterministic <:< for deeply nested typesJason Zaugg2014-01-151-25/+10
* | | | | | | | | | | | 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
| |/ / / / / / / / / /
* / / / / / / / / / / Make partest to depend on Scala compiler Eclipse project.Grzegorz Kossakowski2014-05-071-3/+3
|/ / / / / / / / / /
* | | | / / / / / / Respect -Dpartest.scalac_opts when running the test suite through ANTLukas Rytz2014-05-071-1/+1
| |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #3708 from lrytz/intellijJason Zaugg2014-05-0217-71/+186
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | IntelliJ project filesLukas Rytz2014-05-0217-71/+186
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge pull request #3702 from gkossakowski/undoPairsGrzegorz Kossakowski2014-04-271-3/+10
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Use named class for UndoPair.Grzegorz Kossakowski2014-04-251-3/+10
* | | | | | | | SI-8478 Fix a performance regression in subtypingJason Zaugg2014-04-231-2/+2
| |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #3635 from retronym/ticket/8329Jason Zaugg2014-04-211-13/+12
|\ \ \ \ \ \ \
| * | | | | | | SI-8329 Better hygiene for patmat partial functionsJason Zaugg2014-03-151-13/+12
* | | | | | | | Merge pull request #3670 from retronym/ticket/8463Jason Zaugg2014-04-211-1/+4
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | SI-8463 Avoid unpositioned errors from search for viewsJason Zaugg2014-04-021-1/+4
* | | | | | | | Merge pull request #3685 from VladUreche/issue/8514-masterJason Zaugg2014-04-211-3/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | SI-8514 Remove scaladoc html inconsistenciesVlad Ureche2014-04-181-3/+0
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | 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-211-15/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | SI-8497 Fix regression in pickling of AnnotatedTypesJason Zaugg2014-04-141-15/+16
* | | | | | | | | Merge pull request #3618 from mkubala/SI-8144Jason Zaugg2014-04-217-49/+168
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | SI-8144 permalinks in scaladocMarcin Kubala2014-03-147-49/+168
* | | | | | | | | | Merge pull request #3645 from retronym/ticket/8430Jason Zaugg2014-04-211-6/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | SI-8430 Less non-determinism in patmat exhautiveness warningsJason Zaugg2014-03-241-6/+6
* | | | | | | | | | | Merge pull request #3633 from som-snytt/issue/repl-needs-typerJason Zaugg2014-04-213-4/+15
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | SI-8415 Exception handling in REPL initSom Snytt2014-03-153-4/+15
* | | | | | | | | | | | Merge pull request #3634 from retronym/ticket/7992Jason Zaugg2014-04-211-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | SI-7992 Fix super-accessor generation after a local classJason Zaugg2014-03-151-0/+2
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |