summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove GenASM, merge remaining common code snippetsSimon Ochsenreither2015-10-2798-4119/+861
* Merge pull request #4820 from lrytz/t9535Lukas Rytz2015-10-279-27/+74
|\
| * SI-9535 correct bytecode and generic signatures for @throws[TypeParam]Lukas Rytz2015-10-269-27/+74
* | Merge pull request #4821 from retronym/review/4817Jason Zaugg2015-10-271-32/+0
|\ \
| * | Remove unneeded overrides from ReplGLobalSom Snytt2015-10-271-32/+0
| |/
* | Merge pull request #4815 from som-snytt/test/stringcontext-fJason Zaugg2015-10-273-193/+160
|\ \
| * | f interp test is junitSom Snytt2015-10-253-193/+160
| |/
* | Merge pull request #4807 from lrytz/opt/innerClassAttrLukas Rytz2015-10-2613-317/+344
|\ \ | |/ |/|
| * Clean up CoreBTypes, consistent names, remove unused entriesLukas Rytz2015-10-2010-190/+136
| * Simplify and correctify calculation of the InnerClass attributeLukas Rytz2015-10-2011-153/+234
* | Merge pull request #4802 from SethTisue/merge-2.11-to-2.12-oct-16Lukas Rytz2015-10-2126-88/+264
|\ \ | |/ |/|
| * merge 2.11.x onto 2.12.x, Oct 16 2015Seth Tisue2015-10-1626-88/+264
| |\
| | * Merge pull request #4791 from performantdata/issue/9508Lukas Rytz2015-10-158-47/+17
| | |\
| | | * SI-9508 fix classpaths in Eclipse configurationPerformant Data LLC2015-10-128-47/+17
| | * | Merge pull request #4798 from performantdata/issue/9513Seth Tisue2015-10-152-1/+60
| | |\ \
| | | * | Suppress unneeded import.Performant Data LLC2015-10-141-2/+2
| | | * | Document some OpenHashMap internal methods.Performant Data LLC2015-10-101-0/+13
| | | * | SI-9513 decrement "deleted" count in OpenHashMap.put() when slot reusedPerformant Data LLC2015-10-102-1/+47
| | | |/
| | * | Merge pull request #4788 from dk14/patch-1Seth Tisue2015-10-141-1/+1
| | |\ \
| | | * | explicitly specify insertion-order feature in docsdk142015-10-061-1/+1
| | * | | Merge pull request #4771 from som-snytt/issue/9492-hereSeth Tisue2015-10-144-16/+83
| | |\ \ \
| | | * | | SI-9492 Line trimming pasteSom Snytt2015-09-272-3/+8
| | | * | | SI-9492 REPL paste here docSom Snytt2015-09-273-16/+78
| | * | | | Merge pull request #4610 from todesking/spec-implicits-remove-obsoleteSeth Tisue2015-10-141-2/+10
| | |\ \ \ \
| | | * | | | Add view/context-bound parameter ordering ruletodesking2015-09-241-0/+10
| | | * | | | Spec: Implicit parameters with context/view bound is allowed since 2.10todesking2015-07-081-2/+0
| | * | | | | Merge pull request #4789 from janekdb/2.11.x-param-names-predicates-operationsSeth Tisue2015-10-139-71/+86
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | Rename forall, exists and find predicate and operator params.Janek Bogucki2015-10-099-71/+86
| | |/ / / /
| | * | | | Merge pull request #4790 from SethTisue/issue/9501Seth Tisue2015-10-071-1/+10
| | |\ \ \ \
| | | * | | | SI-9501 link README to Scala Hacker GuideSeth Tisue2015-10-061-1/+10
| | | | |_|/ | | | |/| |
| | * | | | Merge pull request #4786 from performantdata/issue/9506Jason Zaugg2015-10-079-0/+18
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | SI-9506 suppress Scala IDE-generated files in the Eclipse project dirsPerformant Data LLC2015-10-062-0/+4
| | | * | | SI-9506 suppress Scala IDE-generated files in the Eclipse project dirsPerformant Data LLC2015-10-057-0/+14
| | |/ / /
* | | | | Merge pull request #4801 from lrytz/opt/inlinerCleanupsLukas Rytz2015-10-2016-269/+539
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Allow @inline/noinline at callsites (in addition to def-site)Lukas Rytz2015-10-2013-41/+175
| * | | | Correctly handle post-inline requests of non-existing callsitesLukas Rytz2015-10-203-35/+121
| * | | | Simplify post inlining requestsLukas Rytz2015-10-206-150/+74
| * | | | Rename filter to withFilter in RightBiasedEitherLukas Rytz2015-10-201-3/+3
| * | | | Don't create inline requests for callsites that cannot be inlinedLukas Rytz2015-10-204-71/+197
|/ / / /
* | | | Merge pull request #4797 from lrytz/M3-versionsSeth Tisue2015-10-091-3/+3
|\ \ \ \
| * | | | Bump starr to 2.12.0-M3Lukas Rytz2015-10-091-3/+3
|/ / / /
* | | | Merge pull request #4787 from lrytz/implicitAmbiguousDocSeth Tisue2015-10-061-7/+7
|\ \ \ \
| * | | | Minor fixes to Scaladoc of implicitAmbiguousLukas Rytz2015-10-061-7/+7
|/ / / /
* | | | Merge pull request #4784 from lrytz/merge-2.11-to-2.12-oct-5v2.12.0-M3Lukas Rytz2015-10-0534-69/+291
|\ \ \ \
| * | | | Merge commit '42cafa2' into merge-2.11-to-2.12-oct-5Lukas Rytz2015-10-050-0/+0
| |\| | |
| | * | | Merge pull request #4782 from performantdata/issue/9502Lukas Rytz2015-10-051-3/+3
| | |\ \ \
| | | * | | SI-9502 Update Eclipse classpaths for scaladoc project.Michael2015-10-021-3/+3
| * | | | | Merge commit 'bb3ded3' into merge-2.11-to-2.12-oct-5Lukas Rytz2015-10-0534-69/+291
|/| | | | | | |/ / / /
| * | | | Merge pull request #4770 from SethTisue/windows-testing-fixesLukas Rytz2015-10-055-17/+37
| |\ \ \ \
| | * | | | add missing newline at eof in Scala sourceSeth Tisue2015-09-251-1/+1