summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/interactive
Commit message (Expand)AuthorAgeFilesLines
* Be explicit about empty param list calls.Jason Zaugg2013-02-242-2/+2
* Merge 2.10.x into master.Adriaan Moors2013-02-202-3/+4
|\
| * SI-7134: don't require doc.Settings in base api of scaladoc.Eugene Vigdorchik2013-02-152-3/+4
* | Maintenance of Predef.Paul Phillips2013-02-121-2/+2
* | Merge remote-tracking branch 'origin/2.10.x' into merge-210Paul Phillips2013-02-102-10/+10
|\|
| * Merge pull request #1993 from mads379/SI-7026-2.10.xAdriaan Moors2013-02-072-10/+10
| |\
| | * SI-7026: parseTree should never return a typed oneMads Hartmann Jensen2013-02-072-10/+10
| * | Merge pull request #2075 from vigdorchik/tocakeAdriaan Moors2013-02-075-110/+131
| |\ \
| * \ \ Merge pull request #2068 from scalamacros/ticket/7064Adriaan Moors2013-02-071-3/+3
| |\ \ \
| | * | | [nomaster] Revert "DummyTree => CannotHaveAttrs"Eugene Burmako2013-02-051-3/+3
| | | |/ | | |/|
* | | | Merge commit 'f784fbfbce' into merge-210Paul Phillips2013-02-105-110/+131
|\ \ \ \ | | |_|/ | |/| |
| * | | Add a request to presentation compiler to fetch doc comment information.Eugene Vigdorchik2013-02-065-110/+131
| | |/ | |/|
* | | Merge commit '81d8f9d3da' into merge-210Paul Phillips2013-02-094-26/+5
|\ \ \ | | |/ | |/|
| * | Fix SI-6578. Deprecated `askType` because of possible race conditions in type...Iulian Dragos2013-02-014-26/+6
| |/
| * Remove stray debugging output line.Paul Phillips2012-12-221-1/+0
* | Merge pull request #1931 from danielhopkins/remove-pimpingPaul Phillips2013-01-251-1/+1
|\ \
| * | Remove the term "pimp" from the repositoryDan Hopkins2013-01-191-1/+1
* | | Merge pull request #1897 from retronym/ticket/6964Paul Phillips2013-01-153-537/+0
|\ \ \ | |/ / |/| |
| * | SI-6964 Remove build managers, both simple and refined.Jason Zaugg2013-01-123-537/+0
* | | adds Trees.replace(Tree, Tree)Eugene Burmako2013-01-091-9/+0
|/ /
* | Updated copyright to 2013Carlo Dapor2013-01-021-1/+1
* | Remove stray debugging output line.Paul Phillips2012-12-221-1/+0
* | Merge remote-tracking branch 'origin/2.10.x' into merge-2.10.xPaul Phillips2012-12-203-0/+61
|\|
| * Cleanup MemberLookup. Better explain ambiguous link targets.Eugene Vigdorchik2012-12-131-0/+9
| * Merge pull request #1722 from vigdorchik/ide.apiAdriaan Moors2012-12-123-1/+53
| |\
| | * Extract base scaladoc functionality for the IDE.Eugene Vigdorchik2012-12-123-1/+53
* | | Merge branch 'merge-wip-into-2.10.x' into merge-2.10-into-masterPaul Phillips2012-12-111-3/+3
|\| |
| * | DummyTree => CannotHaveAttrsEugene Burmako2012-12-061-3/+3
| |/
* | Remove TermName -> String implicit.Paul Phillips2012-12-021-3/+1
* | Remove code from compiler central.Paul Phillips2012-11-202-40/+0
* | Revert "Commenting out unused members."Paul Phillips2012-11-192-35/+35
* | Commenting out unused members.Paul Phillips2012-11-192-35/+35
| |
| \
*-. \ Merge remote-tracking branches 'origin/2.10.x' and 'origin/2.10.0-wip' into m...Paul Phillips2012-11-141-9/+32
|\ \ \ | | |/ | |/|
| * | Merge pull request #1583 from dragos/issue/fix-6616Adriaan Moors2012-11-131-9/+32
| |\ \ | | |/ | |/|
| | * SI-6616 Check that unsafe operations are only called on the presentation comp...Iulian Dragos2012-11-061-9/+32
* | | Removed unused imports.Paul Phillips2012-11-0615-47/+11
* | | Merge commit 'refs/pull/1574/head' into merge-210Paul Phillips2012-11-0516-16/+16
|\| |
| * | Brings all copyrights (in comments) up-to-date, from 2011/12 to 2013Heather Miller2012-11-0216-16/+16
| |/
* | Removing unused locals and making vars into vals.Paul Phillips2012-11-032-3/+4
* | Remove unused private members.Paul Phillips2012-11-013-3/+4
* | Merge remote-tracking branch 'origin/2.10.x' into merge-210Paul Phillips2012-10-194-1/+19
|\|
| * Merge pull request #1487 from dragos/issue/fix-6505Josh Suereth2012-10-111-0/+11
| |\
| | * Fixed SI-6505. Respond to ask calls by immediate failure even after compiler ...Iulian Dragos2012-10-101-0/+11
| * | Deprecated instrumentation APIMirco Dotta2012-10-104-1/+8
| |/
* | Merge remote-tracking branch 'scala/2.10.x'Grzegorz Kossakowski2012-10-031-3/+3
|\|
| * Fixes deprecation annotations for 2.10.0Josh Suereth2012-09-301-3/+3
* | Merge 2.10.x into master to fix breaking tests and keep things up-to-date.Josh Suereth2012-09-271-6/+7
|\|
| * Fixed instrumentation code so that it can deal with:Martin Odersky2012-09-251-6/+7
* | Merge branch '2.10.x' into masterPaul Phillips2012-09-191-3/+3
|\|
| * More relative path elimination.Paul Phillips2012-09-151-3/+3