summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4374 from retronym/ticket/9200Lukas Rytz2015-03-261-2/+2
|\
| * SI-9200 Fix Java generic signatures for refined typesJason Zaugg2015-03-051-2/+2
* | Merge pull request #4396 from retronym/ticket/9074-2.12Lukas Rytz2015-03-245-23/+9
|\ \
| * | SI-9074 Fix generic substitution with package objects, overloadingJason Zaugg2015-03-245-23/+9
* | | Merge pull request #4352 from som-snytt/issue/9167-2.12Jason Zaugg2015-03-241-28/+22
|\ \ \ | |/ / |/| |
| * | SI-9167 Clarify ScalaVersion parsingSom Snytt2015-02-201-28/+22
* | | Merge pull request #4302 from som-snytt/issue/deprecate-named-paramLukas Rytz2015-03-234-50/+62
|\ \ \
| * | | SI-9140 Minor refactor for readabilitySom Snytt2015-02-091-58/+56
| * | | SI-9140 Allow omitting pleonastic parameter nameSom Snytt2015-02-093-5/+11
| * | | SI-9140 Allow deprecating current parameter nameSom Snytt2015-02-082-9/+17
| |/ /
* | | Merge pull request #4301 from som-snytt/issue/8918-deferredLukas Rytz2015-03-231-5/+17
|\ \ \
| * | | SI-8918 Unary ids are plain idsSom Snytt2015-02-081-5/+17
| |/ /
* | | Merge pull request #4300 from CodeMettle/FiniteDuration.toCoarsestLukas Rytz2015-03-231-1/+1
|\ \ \
| * | | Declare FiniteDuration.toCoarsest to return a FiniteDurationSteven Scott2015-02-061-1/+1
| |/ /
* | | Merge pull request #4372 from som-snytt/issue/7775-tweakLukas Rytz2015-03-234-6/+15
|\ \ \
| * | | SI-7775 Exclude nulls when iterating sys propsSom Snytt2015-03-024-6/+15
| |/ /
* | | Merge pull request #4241 from kanielc/SI-6778Lukas Rytz2015-03-231-1/+1
|\ \ \
| * | | SI-6778 scala.math.random should have parenthesisDenton Cockburn2015-01-101-1/+1
* | | | SI-7784 Allow a singleton type over a constant value defn.Jason Zaugg2015-02-281-1/+1
| |_|/ |/| |
* | | Merge pull request #4284 from ms-tg/SI-8990-rebase-on-2.12-squashedAdriaan Moors2015-02-231-52/+27
|\ \ \
| * | | SI-8990 Allow GC during lazy evaluation of Stream#withFilterMarc Siegel2015-02-201-52/+27
| | |/ | |/|
* | | Merge pull request #4343 from adriaanm/reword-4267Adriaan Moors2015-02-232-36/+55
|\ \ \
| * | | SI-9113 Converting `null` collection Java<->Scala yields `null`Roman Hargrave2015-02-182-36/+55
| |/ /
* | | Merge pull request #4323 from axel22/t-concurrent-map-get-2.12.xAdriaan Moors2015-02-231-0/+11
|\ \ \
| * | | Fix SI-9147 Override `getOrElseUpdate` in `concurrent.Map`.Aleksandar Prokopec2015-02-121-0/+11
| |/ /
* / / SI-9131 Fix use of apply syntactic sugar with by-name paramJason Zaugg2015-02-032-18/+2
|/ /
* | Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-2015...Jason Zaugg2015-01-29134-503/+943
|\ \
| * | Add an IntelliJ module for the Pax Exam based OSGi testsJason Zaugg2015-01-282-0/+24
| * | Merge pull request #4214 from som-snytt/issue/5154Jason Zaugg2015-01-221-4/+3
| |\ \
| | * | SI-5154 Parse leading literal brace in XML patternSom Snytt2014-12-161-4/+3
| * | | Merge pull request #4190 from kanielc/SI-5817Jason Zaugg2015-01-222-0/+20
| |\ \ \
| | * | | SI-5817: Add header to language.scala and languageFeature.scalaDenton Cockburn2014-12-052-0/+20
| * | | | Merge pull request #4253 from retronym/ticket/9087Grzegorz Kossakowski2015-01-201-0/+5
| |\ \ \ \
| | * | | | SI-9087 Fix min/max of reversed Double/Float orderingsJason Zaugg2015-01-201-0/+5
| * | | | | Address review feedbackLukas Rytz2015-01-164-19/+44
| * | | | | Construct ClassBTypes from parsed classfilesLukas Rytz2015-01-168-80/+306
| * | | | | Cleanup asm-to-string debug helpersLukas Rytz2015-01-161-14/+56
| * | | | | Remove an unnecessary hash map in BTypesFromSymbolsLukas Rytz2015-01-161-12/+5
| * | | | | Type alias for InternalNameLukas Rytz2015-01-162-5/+17
| * | | | | Make ClassBType independent of the name tableLukas Rytz2015-01-163-60/+12
| * | | | | Merge pull request #4249 from retronym/ticket/9089Vlad Ureche2015-01-161-1/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | SI-9089 Another REPL/FSC + specialization bug fixJason Zaugg2015-01-151-1/+0
| * | | | | Merge pull request #4201 from mpociecha/fix-typos-in-docs-and-commentsGrzegorz Kossakowski2015-01-14112-196/+196
| |\ \ \ \ \
| | * | | | | Fix many typos in docs and commentsmpociecha2014-12-14113-197/+197
| * | | | | | Merge pull request #4234 from JanBessai/ShowCodeEscapeFixGrzegorz Kossakowski2015-01-141-1/+2
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | SI-9057 - fix `showCode` to put backticks around names including dotsJan Bessai2015-01-071-1/+2
| * | | | | | Merge pull request #4200 from er1c/typoJason Zaugg2015-01-091-1/+1
| |\ \ \ \ \ \
| | * | | | | | Fix scaladoc OutpuStream typoEric Peters2014-12-121-1/+1
| | | |/ / / / | | |/| | | |
| * | | | | | Merge pull request #4229 from Kornel/feature/SI-9067-enumeration-with-name-im...Grzegorz Kossakowski2015-01-081-1/+2
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | SI-9067: Enumeration withName improvementKornel Kielczewski2015-01-051-1/+2