summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '2.11.x' into merge/2.11.x-to-2.12.x-20150624Jason Zaugg2015-06-24102-1136/+2343
|\
| * Merge pull request #4574 from janekdb/2.11.x-typos-g-iJason Zaugg2015-06-2310-10/+10
| |\
| | * Fix 25 typos (g-i)Janek Bogucki2015-06-2210-10/+10
| * | Merge pull request #4564 from som-snytt/issue/promptv2.11.7Adriaan Moors2015-06-228-101/+109
| |\ \
| | * | SI-9206 Local refactor to save eyesightSom Snytt2015-06-212-42/+39
| | * | SI-9206 Accept paste with custom promptSom Snytt2015-06-213-24/+28
| | * | SI-9206 Verbose REPL prompt for info modeSom Snytt2015-06-191-6/+7
| | * | SI-9206 Fix REPL code indentationSom Snytt2015-06-195-33/+30
| | * | SI-9206 REPL prompt is more easily configuredSom Snytt2015-06-192-12/+20
| | * | SI-9206 BooleanProp if set and not untrueSom Snytt2015-06-181-3/+4
| * | | Merge pull request #4566 from lrytz/t9359Adriaan Moors2015-06-227-56/+85
| |\ \ \
| | * | | SI-9359 Fix InnerClass entry flags for nested Java enumsLukas Rytz2015-06-197-56/+85
| | |/ /
| * | / SI-9253 avoid IndexOutOfBoundsException in TypeMaps.correspondingTypeArgumentBruno Bieth2015-06-221-1/+1
| | |/ | |/|
| * | Fix 36 typos (d-f)Janek Bogucki2015-06-2116-18/+18
| * | Merge pull request #4563 from adriaanm/jline-shadeAdriaan Moors2015-06-1915-273/+334
| |\ \
| | * | SI-9339 Support classpaths with no single compatible jlineAdriaan Moors2015-06-185-11/+31
| | * | Centralize dependencies on jlineAdriaan Moors2015-06-1715-273/+314
| * | | Merge pull request #4331 from Ichoran/issue/8930Adriaan Moors2015-06-191-5/+12
| |\ \ \ | | |_|/ | |/| |
| | * | SI-8930 - Vector updated, +:, and :+ slow when typed as Seq[A]Rex Kerr2015-06-181-5/+12
| * | | Merge pull request #4559 from janekdb/2.11.x-scaladoc-2Seth Tisue2015-06-1811-17/+17
| |\ \ \
| | * | | Fix another several typosMichaƂ Pociecha2015-06-185-7/+7
| | * | | Fix some typos (a-c)Janek Bogucki2015-06-189-10/+10
| * | | | Merge pull request #4529 from lrytz/inlineAccessibilityJason Zaugg2015-06-192-18/+74
| |\ \ \ \
| | * | | | Fix illegal inlining of instructions accessing protected membersLukas Rytz2015-05-282-18/+74
| * | | | | Merge pull request #4543 from som-snytt/issue/7773Seth Tisue2015-06-181-10/+12
| |\ \ \ \ \
| | * | | | | SI-7773 Restore phase id to icode filenameSom Snytt2015-06-071-10/+12
| * | | | | | Merge pull request #4539 from vsalvis/vsalvis-docfixesSeth Tisue2015-06-186-31/+12
| |\ \ \ \ \ \
| | * | | | | | SI-6131 doc: remove broken show member link from all scaladoc pagesvsalvis2015-06-171-1/+0
| | * | | | | | SI-8543 doc: Move TODO out of NumericRange's scaladocvsalvis2015-06-171-4/+4
| | * | | | | | SI-8858 doc: fix note about PartialFunction in Function0, F1 and F2vsalvis2015-06-174-26/+8
| | |/ / / / /
| * | | | | | Merge pull request #4553 from som-snytt/issue/implicit-docSeth Tisue2015-06-182-2/+12
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | SI-9354 ScalaDoc members added via by-name viewSom Snytt2015-06-142-2/+12
| | |/ / / /
| * | | | | Merge pull request #4527 from nicky-zs/fix_BigDecimalLukas Rytz2015-06-181-2/+2
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | fix BigDecimal loosing MathContextZhong Sheng2015-05-271-2/+2
| * | | | | Merge pull request #4560 from adriaanm/t9356Adriaan Moors2015-06-171-11/+9
| |\ \ \ \ \
| | * | | | | SI-9356 more careful assertion in back-endAdriaan Moors2015-06-161-11/+9
| | | |_|_|/ | | |/| | |
| * | | | | Merge pull request #4558 from janekdb/2.11.x-scaladoc-1-list-buffer-tryAdriaan Moors2015-06-172-2/+2
| |\ \ \ \ \
| | * | | | | Improve API documentation for ListBuffer and TryJanek Bogucki2015-06-162-2/+2
| * | | | | | Merge pull request #4541 from vuakko/SI-9348_2.11.xAdriaan Moors2015-06-171-3/+3
| |\ \ \ \ \ \
| | * | | | | | SI-9348 Fix missing last element in exclusive floating point rangesNiko Vuokko2015-06-171-3/+3
| | | |/ / / / | | |/| | | |
| * | | | | | Merge pull request #4545 from retronym/topic/constr-varargs-toolboxAdriaan Moors2015-06-171-0/+1
| |\ \ \ \ \ \
| | * | | | | | SI-9212 Fix toolbox with varargs constructorsJason Zaugg2015-06-091-0/+1
| * | | | | | | Merge pull request #4420 from Ichoran/issue/8254Adriaan Moors2015-06-171-0/+2
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | SI-8254 List SerializationProxy fails to default(Read/Write)ObjectRex Kerr2015-03-311-0/+2
| * | | | | | | Merge pull request #4534 from Ichoran/sorting-reimplAdriaan Moors2015-06-161-477/+235
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | Clean implementation of sorts for scala.util.Sorting.Rex Kerr2015-06-011-477/+235
| * | | | | | | Merge pull request #4548 from ScrapCodes/git_4522Jason Zaugg2015-06-142-16/+56
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | SI-7747 More tests and logic according to our conclusions on #4522.Prashant Sharma2015-06-101-4/+4
| | * | | | | | SI-7747 Limit previous change to imports of REPL valsJason Zaugg2015-05-261-5/+10
| | * | | | | | SI-7747 Make REPL wrappers serialization friendlyPrashant Sharma2015-05-262-16/+51