summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'abd595d' into merge/2.11.x-to-2.12.x-20140915Jason Zaugg2014-09-1636-297/+691
|\
| * Merge pull request #3967 from retronym/topic/mathjaxGrzegorz Kossakowski2014-09-091-1/+1
| |\
| | * Fix broken URL for MathJAX Javascript dependency.Jason Zaugg2014-09-081-1/+1
| * | Merge pull request #3946 from gourlaysama/wip/t5254Grzegorz Kossakowski2014-09-092-11/+46
| |\ \
| | * | SI-5254 running an empty scala script should succeedAntoine Gourlay2014-08-262-11/+46
| * | | Merge pull request #3801 from Ichoran/issue/8474Grzegorz Kossakowski2014-09-092-16/+47
| |\ \ \
| | * | | SI-8474 Inconsistent behavior of patch methodRex Kerr2014-08-242-16/+47
| * | | | Merge pull request #3939 from lrytz/ystatsLukas Rytz2014-09-0815-209/+416
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Make MultiChoiceSetting.compute easier to understandLukas Rytz2014-09-081-18/+11
| | * | | Address PR feedback, fix MultiChoiceSetting.containsLukas Rytz2014-09-083-22/+20
| | * | | Use Enumeration for MultiChoiceSettingSom Snytt2014-09-058-168/+288
| | * | | -Ystatistics accepts a list of phases, cleanups in MultiChoiceSettingLukas Rytz2014-09-0210-164/+254
| | * | | Fix assertThrows, and the behaviors that it shadowedLukas Rytz2014-09-024-6/+12
| * | | | Merge pull request #3935 from lrytz/t8803Jason Zaugg2014-09-054-5/+90
| |\ \ \ \
| | * | | | SI-8803 generate super accessor for super[A], if A is outer superclassLukas Rytz2014-08-204-5/+90
| * | | | | Merge pull request #3961 from lrytz/t8786-disable-testJason Zaugg2014-09-041-1/+3
| |\ \ \ \ \
| | * | | | | SI-8786 disable part of test that's failing the jdk8 buildLukas Rytz2014-09-041-1/+3
| * | | | | | Merge pull request #3932 from gourlaysama/wip/t8498Jason Zaugg2014-09-043-5/+9
| |\ \ \ \ \ \
| | * | | | | | SI-8498 @compileTimeOnly should be aware of bridge methods.Antoine Gourlay2014-08-213-5/+9
| | | |/ / / / | | |/| | | |
| * | | | | | Merge pull request #3951 from pawel-wiejacha/2.11.x_SI-8810_fixGrzegorz Kossakowski2014-09-033-45/+18
| |\ \ \ \ \ \
| | * | | | | | SI-8810 scaladoc: fixed code block indentation normalizationPaweł Wiejacha2014-09-033-45/+18
| * | | | | | | Merge pull request #3960 from gourlaysama/wip/t8113Vlad Ureche2014-09-033-2/+43
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | SI-8113 allow a newline between a link target and titleAntoine Gourlay2014-09-033-2/+43
| |/ / / / / /
| * | | | | | Merge pull request #3955 from som-snytt/issue/8410Grzegorz Kossakowski2014-09-033-2/+18
| |\ \ \ \ \ \
| | * | | | | | SI-8410 Summarize if warnings and not disabledSom Snytt2014-09-011-5/+2
| | * | | | | | SI-8410 Don't warn fatally on disabled flagSom Snytt2014-09-013-3/+22
| * | | | | | | Merge pull request #3958 from lrytz/merge/2.10-to-2.11-sept-2Jason Zaugg2014-09-033-1/+25
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge pull request #3965 from retronym/topic/list-serializableGrzegorz Kossakowski2014-09-105-7/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Prefer scala.Serializable to j.io.SerializableJason Zaugg2014-09-065-7/+7
* | | | | | | | | | Merge pull request #3969 from huitseeker/scaladoc-upheavalGrzegorz Kossakowski2014-09-1011-30/+30
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Change Synchronized(Set|Map) to Java concurrencyFrançois Garillot2014-09-091-6/+7
| * | | | | | | | | | Removing deprecationsFrançois Garillot2014-09-098-19/+19
| * | | | | | | | | | Bump versions for Eclipse .classpath.François Garillot2014-09-093-5/+4
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #3970 from gourlaysama/wip/t8764-product-case-classGrzegorz Kossakowski2014-09-091-21/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | SI-8764 remove Xexperimental special Product members for case classesAntoine Gourlay2014-09-081-21/+3
* | | | | | | | | | Merge pull request #3959 from lrytz/merge/2.11-to-2.12-is-it-really-sept-2-al...Jason Zaugg2014-09-03327-10664/+5264
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ 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
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | |