summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Correct off-by-one error in Product documentation (#5148)Janek Bogucki2016-05-111-1/+1
* SI-9397 Add "_root_" to "GenUtils.scalaFactoryCall" to avoid the scala packag...Shixiong Zhu2016-05-113-2/+14
* SI-9666: Use inline group names in Regex (#4990)som-snytt2016-05-113-8/+86
* BitSet{1,2} conversion (#5127)Ruslan Sennov2016-05-111-5/+7
* Merge pull request #5154 from retronym/merge/2.11.x-to-2.12.x-20160511Jason Zaugg2016-05-112-22/+49
|\
| * Merge commit 'd06ce96' into merge/2.11.x-to-2.12.x-20160511Jason Zaugg2016-05-112-22/+49
| |\
| | * Merge pull request #5128 from szeiger/wip/sbt-ivy-2.11Jason Zaugg2016-05-112-26/+53
| | |\
| | | * Publish usable Scala distributions to Ivy repositoriesStefan Zeiger2016-05-062-26/+53
| * | | Merge commit 'cf38506' into merge/2.11.x-to-2.12.x-20160511Jason Zaugg2016-05-110-0/+0
|/| | | | |/ /
| * | Merge pull request #5139 from SethTisue/disable-integrate-ideAdriaan Moors2016-04-281-0/+4
| |\ \
| | * | disable integrate/ide script on 2.11.xSeth Tisue2016-04-281-0/+4
* | | | Merge pull request #5042 from soc/SI-9539Jason Zaugg2016-05-051-2/+2
|\ \ \ \
| * | | | SI-9539 Specify charset when reading ScalaSignatures, ...Simon Ochsenreither2016-03-151-2/+2
* | | | | Merge pull request #5083 from xuwei-k/fix-Future-scaladocJason Zaugg2016-05-051-2/+2
|\ \ \ \ \
| * | | | | use Future#foreach instead of onSuccess in example codexuwei-k2016-04-141-2/+2
* | | | | | Merge pull request #5112 from lrytz/dropRecursiveClasspathJason Zaugg2016-05-0534-1200/+380
|\ \ \ \ \ \
| * | | | | | Remove abstraction layer in classpath implementationLukas Rytz2016-05-0233-440/+339
| * | | | | | faster AggregateClassPath.findClassLukas Rytz2016-04-231-13/+12
| * | | | | | remove recursive classpath implementationLukas Rytz2016-04-2324-803/+85
* | | | | | | Merge pull request #5132 from acdenhartog/patch-1Jason Zaugg2016-05-052-3/+8
|\ \ \ \ \ \ \
| * | | | | | | test PriorityQueue.reverseArno den Hartog2016-05-021-0/+7
| * | | | | | | Avoid function chaining with reverse methodArno den Hartog2016-04-271-3/+1
* | | | | | | | Merge pull request #5140 from lrytz/inlineDefaultMethodsJason Zaugg2016-05-058-65/+200
|\ \ \ \ \ \ \ \
| * | | | | | | | SD-140 inline the correct default methodLukas Rytz2016-04-288-65/+200
| |/ / / / / / /
* | | | | | | | Emit a warning when a constant expression evaluates to an ArithmeticException...Olli Helenius2016-05-025-7/+15
* | | | | | | | SI-9752 never ignore blank lines when parsing code blocks (#5125)Antoine Gourlay2016-05-023-1/+34
* | | | | | | | SD-142 Avoid noisy log output in backend (#5134)Jason Zaugg2016-05-022-6/+9
* | | | | | | | Add examples to Exception object and group members (#5111)Janek Bogucki2016-05-021-25/+165
* | | | | | | | Merge pull request #5129 from retronym/ticket/9762Jason Zaugg2016-04-293-29/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | SI-9762 Remove workaround after upstream fix in jlineJason Zaugg2016-04-271-20/+0
| * | | | | | | | SI-9762 Update to JLine 2.14.1Jason Zaugg2016-04-273-9/+11
| |/ / / / / / /
* | | | | | | | Fix the Eclipse classpaths for 2.12.0-M4. (#5136)Performant Data2016-04-283-5/+5
* | | | | | | | Merge pull request #5094 from lrytz/classOfUnitAdriaan Moors2016-04-272-2/+15
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix erasure for classOf[Unit], don't erase to classOf[BoxedUnit]Lukas Rytz2016-04-202-2/+15
* | | | | | | | More efficient code for deciding if a mixin forwarder is needed (#5116)Lukas Rytz2016-04-258-16/+42
* | | | | | | | Merge pull request #5115 from lrytz/merge-2.11-to-2.12-apr-22Lukas Rytz2016-04-2516-35/+193
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge commit '2dd311f' into merge-2.11-to-2.12-apr-22Lukas Rytz2016-04-220-0/+0
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | CI: hardcode java path in integrate/windows scriptAdriaan Moors2016-04-211-5/+6
| | * | | | | | | Merge pull request #5113 from adriaanm/ci-win-java6Adriaan Moors2016-04-211-0/+3
| | |\ \ \ \ \ \ \
| | | * | | | | | | CI: use java 6 for windows integrationAdriaan Moors2016-04-211-0/+3
| | |/ / / / / / /
| * | | | | | | | Merge commit '684c314' into merge-2.11-to-2.12-apr-22Lukas Rytz2016-04-227-6/+90
| |\| | | | | | |
| | * | | | | | | SI-9734 Narrow type when import REPL history (#5084)som-snytt2016-04-203-1/+41
| | * | | | | | | SI-9735 REPL prefer standard escapes for code text (#5086)som-snytt2016-04-203-4/+48
| | * | | | | | | Updating README.md Eclipse version reference. (#5092)CodingTwinky2016-04-201-1/+1
| * | | | | | | | Merge commit '23159d2' into merge-2.11-to-2.12-apr-22Lukas Rytz2016-04-229-29/+103
| |\| | | | | | | | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Automate Eclipse settings and update project files: (#5091)Iulian Dragos2016-04-209-27/+101
| | | |_|_|/ / | | |/| | | |
* | | | | | | Merge pull request #5109 from lrytz/pr5064Lukas Rytz2016-04-2373-503/+873
|\ \ \ \ \ \ \
| * | | | | | | Rename the (deprecated) implicit conversion methods in JavaConversionsLukas Rytz2016-04-224-2/+59
| * | | | | | | Cleaned up Scaladoc for JavaConverters and non-deprecated friendsLukas Rytz2016-04-227-872/+261
| * | | | | | | SI-9684 Deprecate JavaConversionsSom Snytt2016-04-2271-152/+1076
| |/ / / / / /