Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3636 from xeno-by/topic/mirror-typeof | Jason Zaugg | 2014-03-25 | 6 | -1/+101 |
|\ | |||||
| * | introduces Mirror.typeOf | Eugene Burmako | 2014-03-25 | 6 | -1/+101 |
|/ | |||||
* | Merge pull request #3653 from densh/si/8200 | Jason Zaugg | 2014-03-25 | 5 | -5/+28 |
|\ | |||||
| * | SI-8200 provide an identity liftable for trees | Denys Shabalin | 2014-03-24 | 5 | -5/+28 |
* | | Merge pull request #3650 from retronym/merge/2.10.x-to-master-1 | Grzegorz Kossakowski | 2014-03-25 | 0 | -0/+0 |
|\ \ | |||||
| * \ | Merge commit 'daa77d1' into merge/2.10.x-to-master-1 | Jason Zaugg | 2014-03-22 | 0 | -0/+0 |
| |\ \ | | |/ | |/| | |||||
| | * | Merge pull request #3602 from xeno-by/topic/backport-vampire-warning | Jason Zaugg | 2014-03-22 | 5 | -1/+62 |
| | |\ | |||||
| | | * | [backport] no longer warns on calls to vampire macros | Eugene Burmako | 2014-03-05 | 5 | -1/+62 |
| | * | | Merge pull request #3643 from gkossakowski/2.10.5-nightlies | Grzegorz Kossakowski | 2014-03-19 | 1 | -1/+1 |
| | |\ \ | | | |/ | | |/| | |||||
| | | * | Bump version to 2.10.5 for nightly builds. | Grzegorz Kossakowski | 2014-03-19 | 1 | -1/+1 |
| | |/ | |||||
| | * | Merge pull request #3491 from retronym/backport/7902v2.10.4-RC3v2.10.4 | Grzegorz Kossakowski | 2014-02-09 | 2 | -1/+19 |
| | |\ | |||||
| | | * | [backport] SI-7902 Fix spurious kind error due to an unitialized symbol | Jason Zaugg | 2014-02-09 | 2 | -1/+19 |
| | |/ | |||||
| | * | Merge pull request #3430 from som-snytt/issue/8205-backport | Jason Zaugg | 2014-01-29 | 1 | -0/+58 |
| | |\ | |||||
| | | * | SI-8205 [nomaster] backport test pos.lineContent | Som Snytt | 2014-01-29 | 1 | -0/+58 |
| | * | | Merge pull request #3415 from xeno-by/topic/reify210x | Eugene Burmako | 2014-01-27 | 1 | -5/+5 |
| | |\ \ | |||||
| | | * | | [nomaster] corrects an error in reify’s documentation | Eugene Burmako | 2014-01-26 | 1 | -5/+5 |
| | |/ / | |||||
| | * | | Merge pull request #3359 from huitseeker/issue/VarianceAdaptations | Jason Zaugg | 2014-01-21 | 6 | -6/+6 |
| | |\ \ | |||||
| | | * | | Backports library changes related to SI-6566 from a419799 | François Garillot | 2014-01-13 | 6 | -6/+6 |
| | * | | | Merge pull request #3367 from retronym/backport/3363 | Jason Zaugg | 2014-01-20 | 10 | -1506/+137 |
| | |\ \ \ | |||||
| | | * | | | [nomaster] SI-8146 Fix non-deterministic <:< for deeply nested types | Jason Zaugg | 2014-01-15 | 7 | -25/+129 |
| | | * | | | [nomaster] Update MiMa and use new wildcard filter | Jason Zaugg | 2014-01-15 | 3 | -1481/+8 |
* | | | | | | Merge pull request #3637 from densh/si/8420 | Jason Zaugg | 2014-03-25 | 2 | -2/+25 |
|\ \ \ \ \ \ | |||||
| * | | | | | | SI-8420 don't crash on unquoting of non-liftable native type | Denys Shabalin | 2014-03-17 | 2 | -2/+25 |
* | | | | | | | Merge pull request #3644 from retronym/ticket/8431 | Jason Zaugg | 2014-03-25 | 3 | -6/+22 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | SI-8428 Refactor ConcatIterator | Jason Zaugg | 2014-03-24 | 2 | -6/+10 |
| * | | | | | | | SI-8428 Fix regression in iterator concatenation | Jason Zaugg | 2014-03-20 | 2 | -1/+13 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #3642 from adriaanm/release-2.11.0-RC3 | Grzegorz Kossakowski | 2014-03-24 | 1 | -8/+8 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Bump versions for 2.11.0-RC3 | Adriaan Moors | 2014-03-18 | 1 | -8/+8 |
|/ / / / / / | |||||
* | | | | | | RC3 will ship with akka-actor 2.3.0v2.11.0-RC3 | Adriaan Moors | 2014-03-18 | 1 | -1/+1 |
* | | | | | | Merge pull request #3641 from adriaanm/fixup-3639 | Adriaan Moors | 2014-03-18 | 1 | -3/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | SI-8341 minor fixup for comments in test | Adriaan Moors | 2014-03-18 | 1 | -3/+3 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #3639 from retronym/ticket/8341 | Adriaan Moors | 2014-03-18 | 3 | -9/+100 |
|\ \ \ \ \ \ | |||||
| * | | | | | | SI-8341 Refine handoff of undet. params from implicit search | Jason Zaugg | 2014-03-18 | 3 | -9/+100 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #3638 from xeno-by/topic/freshname-hotfixv2.11.0-RC2 | Adriaan Moors | 2014-03-17 | 4 | -1/+18 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | SI-8425 don't create double-dollar names in c.freshName | Eugene Burmako | 2014-03-18 | 4 | -1/+18 |
* | | | | | | Merge pull request #3631 from adriaanm/t4492 | Adriaan Moors | 2014-03-16 | 7 | -19/+44 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | SI-4492 More informative error when class not found on classpath | Adriaan Moors | 2014-03-14 | 7 | -19/+44 |
* | | | | | | Merge pull request #3630 from adriaanm/t8368 | Adriaan Moors | 2014-03-14 | 2 | -2/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | SI-8368 respect user-supplied scala.usejavacp | Adriaan Moors | 2014-03-14 | 2 | -2/+3 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #3617 from VladimirNik/typedTreesPrinter-2.11.0-SI-8386 | Adriaan Moors | 2014-03-14 | 3 | -835/+1172 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Printers tests uncommented | VladimirNik | 2014-03-13 | 2 | -1171/+1163 |
| * | | | | | | SI-8386 fixed | VladimirNik | 2014-03-11 | 2 | -270/+615 |
* | | | | | | | Merge pull request #3598 from som-snytt/issue/8266-amend-advice | Adriaan Moors | 2014-03-14 | 2 | -2/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | SI-8266 Amend advice for deprecated octal 042 | Som Snytt | 2014-02-28 | 2 | -2/+3 |
* | | | | | | | | Merge pull request #3624 from puffnfresh/patch-1 | Adriaan Moors | 2014-03-14 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Remove "will not terminate" from toStream doc | Brian McKenna | 2014-03-12 | 1 | -1/+0 |
* | | | | | | | | | Merge pull request #3629 from xeno-by/topic/setter-conflict | Adriaan Moors | 2014-03-14 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | SI-8086 follow-up that fixes the problem with `setter` | Eugene Burmako | 2014-03-13 | 1 | -0/+4 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge pull request #3628 from gzm0/test-fix | Adriaan Moors | 2014-03-14 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Minor fixes in test. The equals method always returned true. | Tobias Schlatter | 2014-03-13 | 2 | -2/+2 |
| |/ / / / / / / / |