summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* SI-6806 Add an @implicitAmbiguous annotationBrian McKenna2015-08-1114-47/+146
* Merge pull request #4649 from janekdb/2.12.x-noTraceSuppressionJason Zaugg2015-07-273-4/+6
|\
| * Align noTraceSuppression val names to system property nameJanek Bogucki2015-07-203-4/+6
* | Merge pull request #4658 from SethTisue/remove-xml-coalescing-hackSeth Tisue2015-07-242-3/+2
|\ \
| * | remove temporary XML coalescing hack we used to build M2Seth Tisue2015-07-212-3/+2
| |/
* | Merge pull request #4638 from lrytz/t9393Jason Zaugg2015-07-2426-162/+333
|\ \
| * | Query methods in api.Symbols for Java flagsLukas Rytz2015-07-224-0/+23
| * | Rename the ENUM / DEFAULTMETHOD flags to include JAVA_Lukas Rytz2015-07-2212-125/+125
| * | SI-9393 fix modifiers of ClassBTypes for Java annotationsLukas Rytz2015-07-2218-40/+188
* | | Merge pull request #4647 from Ichoran/issue/8911Lukas Rytz2015-07-233-5/+48
|\ \ \
| * | | SI-8911 scala.collection.convert.Wrappers$MapWrapper not serializableRex Kerr2015-07-193-5/+48
* | | | Merge pull request #4652 from retronym/ticket/9408Lukas Rytz2015-07-236-9/+82
|\ \ \ \
| * | | | SI-9408 Avoid capturing outer class in local classes.Jason Zaugg2015-07-233-0/+68
| * | | | Refactor to avoid duplicated work in ConstructorsJason Zaugg2015-07-231-3/+5
| * | | | SI-9408 Record known subclasses of local classesJason Zaugg2015-07-234-6/+9
* | | | | Merge pull request #4655 from retronym/merge/2.11.x-to-2.12.x-20152307Lukas Rytz2015-07-2348-50/+151
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-2015...Jason Zaugg2015-07-2348-50/+151
|/| | | |
| * | | | Merge pull request #4650 from lrytz/t8502-packageJason Zaugg2015-07-216-3/+53
| |\ \ \ \
| | * | | | SI-8502 create PackageClass instead of Class symbol stubs for pkgsLukas Rytz2015-07-206-3/+53
| * | | | | Merge pull request #4631 from janekdb/2.11.x-typos-t-vSeth Tisue2015-07-2019-23/+23
| |\ \ \ \ \
| | * | | | | Fix 23 typos (t-v)Janek Bogucki2015-07-1519-23/+23
| * | | | | | Merge pull request #4642 from janekdb/2.11.x-typos-w-zSeth Tisue2015-07-204-6/+6
| |\ \ \ \ \ \
| | * | | | | | Fix 6 typos (w-z)Janek Bogucki2015-07-174-6/+6
| | | |/ / / / | | |/| | | |
| * | | | | | Merge pull request #4643 from janekdb/2.11.x-names-w-zSeth Tisue2015-07-201-2/+2
| |\ \ \ \ \ \
| | * | | | | | Fix typo in val nameJanek Bogucki2015-07-171-2/+2
| | |/ / / / /
| * | | | | | Merge pull request #4632 from janekdb/2.11.x-names-t-vSeth Tisue2015-07-203-4/+4
| |\ \ \ \ \ \
| | * | | | | | Improve some names (t-v)Janek Bogucki2015-07-153-4/+4
| | | |/ / / / | | |/| | | |
| * | | | | | Merge pull request #4646 from SethTisue/issue/9409Seth Tisue2015-07-181-1/+0
| |\ \ \ \ \ \
| | * | | | | | SI-9409 Scaladoc: remove link to nonexistent diagram docSeth Tisue2015-07-181-1/+0
| | | |/ / / / | | |/| | | |
| * | | | | | Merge pull request #4645 from SethTisue/issue/9406Seth Tisue2015-07-181-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | SI-9406 fix doc for Range.takeRightSeth Tisue2015-07-181-1/+1
| |/ / / / /
| * | | | | Merge pull request #4595 from som-snytt/issue/9370Lukas Rytz2015-07-165-2/+45
| |\ \ \ \ \
| | * | | | | SI-9370 Xplugin scans plugin path for descriptorSom Snytt2015-06-305-2/+45
| * | | | | | Merge pull request #4615 from parambirs/patch-1Lukas Rytz2015-07-161-1/+1
| |\ \ \ \ \ \
| | * | | | | | Update scaladoc for Any.scala#equals()Parambir Singh2015-07-091-1/+1
| | | |/ / / / | | |/| | | |
| * | | | | | Merge pull request #4637 from retronym/ticket/9401Lukas Rytz2015-07-163-1/+9
| |\ \ \ \ \ \
| | * | | | | | SI-9401 Avoid SOE with array + missing classtagJason Zaugg2015-07-163-1/+9
| * | | | | | | Merge pull request #4628 from SethTisue/issue/8744Lukas Rytz2015-07-161-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | SI-8744 fix version.number in scaladoc.propertiesSeth Tisue2015-07-131-1/+1
| | |/ / / / /
| * | | | | | Merge pull request #4633 from SethTisue/upgrade-redcarpetAdriaan Moors2015-07-153-4/+2
| |\ \ \ \ \ \
| | * | | | | | use newer Redcarpet to build specSeth Tisue2015-07-153-4/+2
| | |/ / / / /
| * | | | | | Merge pull request #4634 from SethTisue/travis-container-infrastructureAdriaan Moors2015-07-151-1/+4
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | opt-in to Travis's newer/faster container-based infrastructureSeth Tisue2015-07-151-1/+4
| |/ / / / /
* | | | | | Merge pull request #4640 from SethTisue/remove-old-bincompatSeth Tisue2015-07-213-23/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | remove legacy bincompat stuff in Predef.scala, Stream.scalaSeth Tisue2015-07-213-23/+1
| | |_|_|/ | |/| | |
* | | | | Merge pull request #4616 from som-snytt/issue/9383Seth Tisue2015-07-205-37/+111
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | SI-9383 Name the function for implicit importingSom Snytt2015-07-161-6/+11
| * | | | SI-9383 Improved unused import warningSom Snytt2015-07-085-32/+101
* | | | | Merge pull request #4629 from adriaanm/unforkjoinSeth Tisue2015-07-20136-76302/+131
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Remove further references to forkjoinJason Zaugg2015-07-15115-68894/+6