Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | Merge pull request #5717 from som-snytt/issue/10148-followup | Adriaan Moors | 2017-02-19 | 2 | -5/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | SI-10148 Accept verbose zero | Som Snytt | 2017-02-18 | 2 | -5/+13 | |
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #5716 from adriaanm/i296 | Jason Zaugg | 2017-02-19 | 1 | -1/+4 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Ensure ordering for args to `choose` in DurationTest | Adriaan Moors | 2017-02-17 | 1 | -1/+4 | |
* | | | | | | | | | | Merge pull request #5710 from SethTisue/sd-303 | Adriaan Moors | 2017-02-17 | 1 | -3/+7 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | fix recent regression: macro paradise + Java sources = MatchError | Seth Tisue | 2017-02-17 | 1 | -3/+7 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #5701 from SethTisue/merge-2.11.x-to-2.12.x-20170214 | Adriaan Moors | 2017-02-17 | 37 | -133/+1710 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Merge branch '2.12.x' into merge-2.11.x-to-2.12.x-20170214 | Seth Tisue | 2017-02-17 | 89 | -1757/+632 | |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #5693 from markusjura/lineStream-warnings | Seth Tisue | 2017-02-17 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Changing deprecation warning to lineStream | Markus Jura | 2017-02-13 | 1 | -2/+2 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #5697 from som-snytt/issue/10164 | Seth Tisue | 2017-02-17 | 2 | -11/+17 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | SI-10164 BitSet.tail zigs where it zagged | Som Snytt | 2017-02-14 | 2 | -11/+17 | |
* | | | | | | | | | | Merge pull request #5712 from SethTisue/mima-fixup | Lukas Rytz | 2017-02-17 | 1 | -0/+8 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | update MiMa whitelist for infix annotation | Seth Tisue | 2017-02-16 | 1 | -0/+8 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #5684 from SethTisue/partest-sbt-only-plz | Seth Tisue | 2017-02-16 | 4 | -311/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | fix annoying extra space in tab completion of sbt `partest` command | Jason Zaugg | 2017-02-14 | 1 | -1/+1 | |
| * | | | | | | | | | | run partest from sbt always, command line never | Seth Tisue | 2017-02-08 | 3 | -310/+0 | |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #5694 from janekdb/topic/2.12.x-scaladoc-spelling-correcti... | Seth Tisue | 2017-02-16 | 42 | -65/+66 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Fix typos in compiler and reflect | Janek Bogucki | 2017-02-13 | 42 | -65/+66 | |
* | | | | | | | | | | | Merge pull request #5648 from som-snytt/issue/10148 | Seth Tisue | 2017-02-16 | 5 | -10/+60 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | SI-10148 Follow Java for float literals | Som Snytt | 2017-01-18 | 5 | -10/+60 | |
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #5688 from Philippus/fix-scaladoc-base-references | Adriaan Moors | 2017-02-16 | 2 | -3/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | fixed broken references after move from 'model' to 'base' | Philippus Baalman | 2017-02-10 | 2 | -3/+4 | |
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #5674 from Philippus/issue/9519 | Adriaan Moors | 2017-02-16 | 1 | -24/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | SI-9519 removed the usecase section of the ++-method | Philippus Baalman | 2017-02-04 | 1 | -24/+0 | |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #5687 from retronym/ticket/10177 | Adriaan Moors | 2017-02-16 | 2 | -0/+81 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | SI-10177 Override lazy operations to preserve TrieMap's semantics | Jason Zaugg | 2017-02-10 | 2 | -0/+81 | |
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #5589 from allisonhb/feature/si-4700 | Adriaan Moors | 2017-02-16 | 7 | -2/+129 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | SI-4700 Make infix notation default for symbolic types. | allisonhb | 2016-12-14 | 5 | -43/+50 | |
| * | | | | | | | | | | | SI-4700 Show infix types with as few parentheses as needed. | allisonhb | 2016-12-13 | 3 | -9/+41 | |
| * | | | | | | | | | | | SI-4700 Add `@infix` annotation for type printing | Vlad Ureche | 2016-09-19 | 6 | -0/+88 | |
* | | | | | | | | | | | | Merge pull request #5546 from som-snytt/issue/9636 | Adriaan Moors | 2017-02-16 | 5 | -33/+49 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | SI-9636 More precise error pos on apply inference | Som Snytt | 2016-12-20 | 5 | -33/+49 | |
* | | | | | | | | | | | | | Merge pull request #5662 from teldosas/SI-9675 | Adriaan Moors | 2017-02-16 | 4 | -1/+53 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Add warning about non-sensible equals in anonymous functions | teldosas | 2017-02-01 | 4 | -1/+53 | |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #5679 from som-snytt/issue/sliding-doc | Adriaan Moors | 2017-02-16 | 2 | -30/+41 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Nuance doc for sliding | Som Snytt | 2017-02-07 | 2 | -30/+41 | |
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #5692 from lrytz/remove-py | Adriaan Moors | 2017-02-16 | 5 | -1214/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Delete some unused scripts | Lukas Rytz | 2017-02-13 | 5 | -1214/+0 | |
| |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge pull request #5587 from lrytz/t10072 | Adriaan Moors | 2017-02-16 | 2 | -4/+18 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | SI-10072 cast Function nodes to environment in specialization | Lukas Rytz | 2016-12-07 | 2 | -4/+18 | |
* | | | | | | | | | | | | | | Merge pull request #5542 from retronym/ticket/10066 | Adriaan Moors | 2017-02-16 | 4 | -5/+101 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | SI-10066 Fix crash in erroneous code with implicits, dynamic | Jason Zaugg | 2016-11-18 | 4 | -5/+101 | |
* | | | | | | | | | | | | | | Merge pull request #5696 from SethTisue/bootstrap-no-parsers-no-swing | Adriaan Moors | 2017-02-14 | 2 | -42/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | during bootstrap, don't build scala-parser-combinators or -swing | Seth Tisue | 2017-02-13 | 2 | -42/+2 | |
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
| | | | | | | | | | | * | | | Merge commit '0965028809' into merge-2.11.x-to-2.12.x-20170214 | Seth Tisue | 2017-02-16 | 26 | -66/+1606 | |
| | | | | | | | | | | |\ \ \ | ||||||
| | | | | | | | | | | | * \ \ | Merge pull request #5695 from SethTisue/fix-indexedseqtest-under-ant | Seth Tisue | 2017-02-14 | 1 | -3/+14 | |
| | | | | | | | | | | | |\ \ \ | | | | | | | | | | | | | |_|/ | | | | | | | | | | | | |/| | | ||||||
| | | | | | | | | | | | | * | | fix IndexedSeqTest to work in both Ant and sbt | Seth Tisue | 2017-02-13 | 1 | -3/+14 | |
| | | | | | | | | | | | |/ / | ||||||
| | | | | | | | | | | | * | | Merge pull request #5664 from adriaanm/rework-coll-perf | Adriaan Moors | 2017-02-08 | 10 | -45/+1292 | |
| | | | | | | | | | | | |\ \ | ||||||
| | | | | | | | | | | | | * | | Handle WrappedArray the same way as ArrayOps for binary compatibility | Stefan Zeiger | 2017-02-03 | 2 | -33/+67 |