summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '2.12.x' into merge-2.11.x-to-2.12.x-20170214Seth Tisue2017-02-1760-186/+285
|\
| * Merge pull request #5693 from markusjura/lineStream-warningsSeth Tisue2017-02-171-2/+2
| |\
| | * Changing deprecation warning to lineStreamMarkus Jura2017-02-131-2/+2
| * | Merge pull request #5697 from som-snytt/issue/10164Seth Tisue2017-02-171-8/+8
| |\ \
| | * | SI-10164 BitSet.tail zigs where it zaggedSom Snytt2017-02-141-8/+8
| * | | Merge pull request #5694 from janekdb/topic/2.12.x-scaladoc-spelling-correcti...Seth Tisue2017-02-1642-65/+66
| |\ \ \
| | * | | Fix typos in compiler and reflectJanek Bogucki2017-02-1342-65/+66
| * | | | Merge pull request #5648 from som-snytt/issue/10148Seth Tisue2017-02-162-8/+30
| |\ \ \ \
| | * | | | SI-10148 Follow Java for float literalsSom Snytt2017-01-182-8/+30
| * | | | | Merge pull request #5688 from Philippus/fix-scaladoc-base-referencesAdriaan Moors2017-02-162-3/+4
| |\ \ \ \ \
| | * | | | | fixed broken references after move from 'model' to 'base'Philippus Baalman2017-02-102-3/+4
| | | |_|_|/ | | |/| | |
| * | | | | Merge pull request #5674 from Philippus/issue/9519Adriaan Moors2017-02-161-24/+0
| |\ \ \ \ \
| | * | | | | SI-9519 removed the usecase section of the ++-methodPhilippus Baalman2017-02-041-24/+0
| * | | | | | Merge pull request #5687 from retronym/ticket/10177Adriaan Moors2017-02-161-0/+27
| |\ \ \ \ \ \
| | * | | | | | SI-10177 Override lazy operations to preserve TrieMap's semanticsJason Zaugg2017-02-101-0/+27
| * | | | | | | Merge pull request #5589 from allisonhb/feature/si-4700Adriaan Moors2017-02-165-2/+63
| |\ \ \ \ \ \ \
| | * | | | | | | SI-4700 Make infix notation default for symbolic types.allisonhb2016-12-143-22/+33
| | * | | | | | | SI-4700 Show infix types with as few parentheses as needed.allisonhb2016-12-131-9/+21
| | * | | | | | | SI-4700 Add `@infix` annotation for type printingVlad Ureche2016-09-194-0/+38
| * | | | | | | | Merge pull request #5546 from som-snytt/issue/9636Adriaan Moors2017-02-161-32/+24
| |\ \ \ \ \ \ \ \
| | * | | | | | | | SI-9636 More precise error pos on apply inferenceSom Snytt2016-12-201-32/+24
| * | | | | | | | | Merge pull request #5662 from teldosas/SI-9675Adriaan Moors2017-02-161-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Add warning about non-sensible equals in anonymous functionsteldosas2017-02-011-1/+1
| | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge pull request #5679 from som-snytt/issue/sliding-docAdriaan Moors2017-02-162-30/+41
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Nuance doc for slidingSom Snytt2017-02-072-30/+41
| | | |_|_|/ / / / / | | |/| | | | | | |
| * | | | | | | | | Merge pull request #5587 from lrytz/t10072Adriaan Moors2017-02-161-4/+0
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | SI-10072 cast Function nodes to environment in specializationLukas Rytz2016-12-071-4/+0
| * | | | | | | | | | Merge pull request #5542 from retronym/ticket/10066Adriaan Moors2017-02-161-5/+18
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | SI-10066 Fix crash in erroneous code with implicits, dynamicJason Zaugg2016-11-181-5/+18
| * | | | | | | | | | | Merge pull request #5696 from SethTisue/bootstrap-no-parsers-no-swingAdriaan Moors2017-02-141-2/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | during bootstrap, don't build scala-parser-combinators or -swingSeth Tisue2017-02-131-2/+1
| | | |_|/ / / / / / / / | | |/| | | | | | | | |
* | | | | | | | | | | | Merge commit '0965028809' into merge-2.11.x-to-2.12.x-20170214Seth Tisue2017-02-169-62/+289
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Handle WrappedArray the same way as ArrayOps for binary compatibilityStefan Zeiger2017-02-031-21/+23
| * | | | | | | | | | | | Optimised implementation of List.filter/filterNotRory Graves2017-01-283-1/+107
| * | | | | | | | | | | | Optimize slice and take in ArrayOps, WrappedArrayMike Skells2017-01-282-10/+113
| * | | | | | | | | | | | Avoid creating ListBuffer in List.mapConserveRory Graves2017-01-281-20/+31
| * | | | | | | | | | | | SI-1459 two bridges for impl of java generic vararg methodAdriaan Moors2017-01-243-19/+23
| * | | | | | | | | | | | Fix the size of the stack used by RedBlackTree.iteratorFrom.Sébastien Doeraene2017-01-161-2/+3
| * | | | | | | | | | | | Merge pull request #5630 from adriaanm/rebase-5557Adriaan Moors2017-01-105-65/+133
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Simplify creation of varargs forwarder symbolJason Zaugg2017-01-091-42/+26
| | * | | | | | | | | | | | Don’t run the uncurry info transformer on Java symbols.Iulian Dragos2017-01-091-3/+4
| | * | | | | | | | | | | | SI-10071 Separate compilation for varargs methodsIulian Dragos2017-01-095-66/+121
| | * | | | | | | | | | | | SI-8786 fix generic signature for @varargs forwarder methodsLukas Rytz2017-01-092-52/+80
* | | | | | | | | | | | | | Merge commit '36967321c7' into merge-2.11.x-to-2.12.x-20170214Seth Tisue2017-02-164-16/+12
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #5632 from adriaanm/ticket/9114Adriaan Moors2017-01-101-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | SI-9114 Fix crasher in pattern matcher with type aliasesJason Zaugg2017-01-091-1/+1
| | |/ / / / / / / / / / / /
| * | | | | | | | | | | | | Merge pull request #5633 from adriaanm/ticket/9331Adriaan Moors2017-01-103-15/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | SI-9331 Fix canEqual for case classes with HK type paramsJason Zaugg2017-01-093-15/+11
| | |/ / / / / / / / / / / /
| * | | | | | | | | | | | | SI-9762 Remove workaround after upstream fix in jlineJason Zaugg2017-01-091-20/+0
| * | | | | | | | | | | | | SI-9762 Update to JLine 2.14.3Jason Zaugg2017-01-092-7/+9
| |/ / / / / / / / / / / /
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-15 05:44:57 +0000