summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'merge/2.10-to-2.11-sept-2' into merge/2.11-to-2.12-is-it-really...Lukas Rytz2014-09-0254-1813/+2703
|\
| * Merge branch '2.10.x' into merge/2.10-to-2.11-sept-2Lukas Rytz2014-09-020-0/+0
| |\
| | * Merge pull request #3937 from som-snytt/issue/8787-doc-backportGrzegorz Kossakowski2014-09-021-186/+291
| | |\
| | | * [backport] SI-8787 Backport Regex docSom Snytt2014-08-261-186/+291
| | |/
| | * Merge pull request #3865 from xeno-by/topic/extractor-macros-210xGrzegorz Kossakowski2014-08-195-42/+114
| | |\
| | | * [backport] transformers no longer ignore UnApply.funEugene Burmako2014-07-035-42/+114
| | * | Merge pull request #3860 from gourlaysama/wip/t7710-backportGrzegorz Kossakowski2014-08-193-3/+39
| | |\ \
| | | * | [backport] SI-7710 fix memory performance of RegexParsers in jdk7u6+Antoine Gourlay2014-08-123-3/+39
| | | |/
| * | | Merge commit 'b5759ef' into merge/2.10-to-2.11-sept-2Lukas Rytz2014-09-023-1/+25
| |\| |
| | * | Merge pull request #3904 from kzys/jira-8314-2.10.xGrzegorz Kossakowski2014-08-072-0/+19
| | |\ \
| | | * | Prevent SI-8314 by adding a testKato Kazuyoshi2014-07-312-0/+19
| | |/ /
| | * | Merge pull request #3752 from jeroentervoorde/SI_8589Adriaan Moors2014-07-041-1/+6
| | |\ \ | | | |/ | | |/|
| | | * SI-8589 Performance improvement for ArrayCharSequence.toStringJeroen ter Voorde2014-06-191-1/+6
| | |/
| * | Merge pull request #3952 from gourlaysama/wip/t8828-lint-innacessibleGrzegorz Kossakowski2014-09-023-1/+22
| |\ \
| | * | SI-8828 fix regression in Xlint visibility warning for sealed classesAntoine Gourlay2014-08-283-1/+22
| * | | Merge pull request #3956 from gourlaysama/wip/interp-warnGrzegorz Kossakowski2014-09-023-4/+4
| |\ \ \
| | * | | SI-7931 fix Dscala.repl.vids and some string interpolation typosAntoine Gourlay2014-09-023-4/+4
| | |/ /
| * | | Merge pull request #3948 from retronym/ticket/8823Grzegorz Kossakowski2014-09-022-1/+11
| |\ \ \
| | * | | SI-8823 Exclude specialized methods from extension method rewriteJason Zaugg2014-08-272-1/+11
| * | | | Merge pull request #3931 from lrytz/opt/tracked-finalLukas Rytz2014-09-0129-1787/+2418
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Small cleanup in toTypeKind.Lukas Rytz2014-09-011-11/+2
| | * | | Fix InnerClass / EnclosingMethod attributesLukas Rytz2014-09-0123-255/+1090
| | * | | Don't traverse all trees in delambdafy phase if delambdafy:inlineLukas Rytz2014-09-011-0/+9
| | * | | Fix indentation in delambdafyLukas Rytz2014-08-191-25/+25
| | * | | Integrate CoreBTypes by composition (not inheritance), non-var fieldsLukas Rytz2014-08-199-202/+253
| | * | | Minor cleanups, integrating review feedbackLukas Rytz2014-08-193-5/+3
| | * | | Add the ACC_DEPRECATED flag in javaFlags, instead of each call site.Lukas Rytz2014-08-193-25/+9
| | * | | Remove Tracked, add type information to ClassBTypeLukas Rytz2014-08-1910-1537/+1298
| | * | | Set currentUnit while generating bytecode.Lukas Rytz2014-08-192-3/+5
| * | | | Merge pull request #3949 from lrytz/t8627Grzegorz Kossakowski2014-08-276-13/+139
| |\ \ \ \
| | * | | | SI-8627 make Stream.filterNot non-eagerLukas Rytz2014-08-276-13/+139
| | |/ / /
| * | | | Merge pull request #3905 from gourlaysama/wip/t5691-2Lukas Rytz2014-08-2610-7/+85
| |\ \ \ \
| | * | | | SI-5691 lint warning when a type parameter shadows an existing type.Antoine Gourlay2014-08-1210-7/+85
* | | | | | Merge commit 'eb74148' into merge/2.11-to-2.12-is-it-really-sept-2-already-wh...Lukas Rytz2014-09-020-0/+0
|\| | | | |
| * | | | | Merge pull request #3947 from lrytz/backportsLukas Rytz2014-08-2622-42/+84
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Merge remote-tracking branch 'upstream/2.11.x' into backportsLukas Rytz2014-08-26131-815/+1383
| | |\ \ \ \ | | |/ / / / | |/| | | |
| | * | | | [backport] Rewrite explanation of doc-source-url option more clearly, and fix...Masato Sogame2014-08-111-1/+1
| | * | | | [backport] Update javadoc tag to new scaladoc tags.Masato Sogame2014-08-113-12/+20
| | * | | | [backport] Fixes cut sentences in the generated scaladocsDominik Gruntz2014-08-1111-18/+18
| | * | | | [backport] Refactored example to Option.collect method.jxcoder2014-08-111-3/+3
| | * | | | [backport] Fixed mathematically wrong statement in the documentation of scala...Malte Isberner2014-08-111-5/+12
| | * | | | [backport] Fix scaladoc typoLukas Elmer2014-08-111-1/+1
| | * | | | [backport] Did not know of the fix for SI-8672. Followed the recommendation g...Dominik Gruntz2014-08-111-2/+2
| | * | | | [backport] Fixes first sentence delimitersdgruntz2014-08-111-2/+2
| | * | | | [backport] [scaladoc] Changed align of example code to Option.contains and Op...Maks Atygaev2014-08-111-16/+16
| | * | | | [backport] SI-8705 Added example to Option.contains method.jxcoder2014-08-111-0/+11
| | * | | | [backport] Added example to Option.collect method.jxcoder2014-08-111-0/+11
| | * | | | [backport] Change StringContext scaladocEvgeny Vereshchagin2014-08-111-1/+1
| | * | | | [backport] som-snytt's update to wordingMax Bileschi2014-08-111-3/+3
| | * | | | [backport] Revised comment to appeal to lchoran's and som-snytts commentsMax Bileschi2014-08-111-5/+4
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-11 04:29:42 +0000