summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* SI-10026 Fix endless cycle in runtime reflectionJason Zaugg2017-02-196-6/+38
* Merge pull request #5716 from adriaanm/i296Jason Zaugg2017-02-191-1/+4
|\
| * Ensure ordering for args to `choose` in DurationTestAdriaan Moors2017-02-171-1/+4
* | Merge pull request #5710 from SethTisue/sd-303Adriaan Moors2017-02-171-3/+7
|\ \ | |/ |/|
| * fix recent regression: macro paradise + Java sources = MatchErrorSeth Tisue2017-02-171-3/+7
* | Merge pull request #5701 from SethTisue/merge-2.11.x-to-2.12.x-20170214Adriaan Moors2017-02-1737-133/+1710
|\ \ | |/ |/|
| * Merge branch '2.12.x' into merge-2.11.x-to-2.12.x-20170214Seth Tisue2017-02-1789-1757/+632
| |\ | |/ |/|
* | 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-172-11/+17
|\ \ \
| * | | SI-10164 BitSet.tail zigs where it zaggedSom Snytt2017-02-142-11/+17
* | | | Merge pull request #5712 from SethTisue/mima-fixupLukas Rytz2017-02-171-0/+8
|\ \ \ \
| * | | | update MiMa whitelist for infix annotationSeth Tisue2017-02-161-0/+8
|/ / / /
* | | | Merge pull request #5684 from SethTisue/partest-sbt-only-plzSeth Tisue2017-02-164-311/+1
|\ \ \ \
| * | | | fix annoying extra space in tab completion of sbt `partest` commandJason Zaugg2017-02-141-1/+1
| * | | | run partest from sbt always, command line neverSeth Tisue2017-02-083-310/+0
* | | | | 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-165-10/+60
|\ \ \ \ \ \
| * | | | | | SI-10148 Follow Java for float literalsSom Snytt2017-01-185-10/+60
* | | | | | | 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-162-0/+81
|\ \ \ \ \ \ \
| * | | | | | | SI-10177 Override lazy operations to preserve TrieMap's semanticsJason Zaugg2017-02-102-0/+81
* | | | | | | | Merge pull request #5589 from allisonhb/feature/si-4700Adriaan Moors2017-02-167-2/+129
|\ \ \ \ \ \ \ \
| * | | | | | | | SI-4700 Make infix notation default for symbolic types.allisonhb2016-12-145-43/+50
| * | | | | | | | SI-4700 Show infix types with as few parentheses as needed.allisonhb2016-12-133-9/+41
| * | | | | | | | SI-4700 Add `@infix` annotation for type printingVlad Ureche2016-09-196-0/+88
* | | | | | | | | Merge pull request #5546 from som-snytt/issue/9636Adriaan Moors2017-02-165-33/+49
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | SI-9636 More precise error pos on apply inferenceSom Snytt2016-12-205-33/+49
* | | | | | | | | | Merge pull request #5662 from teldosas/SI-9675Adriaan Moors2017-02-164-1/+53
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add warning about non-sensible equals in anonymous functionsteldosas2017-02-014-1/+53
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | 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 #5692 from lrytz/remove-pyAdriaan Moors2017-02-165-1214/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Delete some unused scriptsLukas Rytz2017-02-135-1214/+0
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #5587 from lrytz/t10072Adriaan Moors2017-02-162-4/+18
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | SI-10072 cast Function nodes to environment in specializationLukas Rytz2016-12-072-4/+18
* | | | | | | | | | | Merge pull request #5542 from retronym/ticket/10066Adriaan Moors2017-02-164-5/+101
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | SI-10066 Fix crash in erroneous code with implicits, dynamicJason Zaugg2016-11-184-5/+101
* | | | | | | | | | | | Merge pull request #5696 from SethTisue/bootstrap-no-parsers-no-swingAdriaan Moors2017-02-142-42/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | during bootstrap, don't build scala-parser-combinators or -swingSeth Tisue2017-02-132-42/+2
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
| | | | | | | | | | | * Merge commit '0965028809' into merge-2.11.x-to-2.12.x-20170214Seth Tisue2017-02-1626-66/+1606
| | | | | | | | | | | |\
| | | | | | | | | | | | * Merge pull request #5695 from SethTisue/fix-indexedseqtest-under-antSeth Tisue2017-02-141-3/+14
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * fix IndexedSeqTest to work in both Ant and sbtSeth Tisue2017-02-131-3/+14
| | | | | | | | | | | | |/
| | | | | | | | | | | | * Merge pull request #5664 from adriaanm/rework-coll-perfAdriaan Moors2017-02-0810-45/+1292
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * Handle WrappedArray the same way as ArrayOps for binary compatibilityStefan Zeiger2017-02-032-33/+67
| | | | | | | | | | | | | * Add benchmark for List.mapConserveRory Graves2017-01-281-0/+15
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-20 17:21:36 +0000