| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'origin/2.11.x' into 2.12.x | Seth Tisue | 2015-09-08 | 1 | -1/+1 |
| | | | | | | | | | only trivial merge conflicts here. not dealing with PR #4333 in this merge because there is a substantial conflict there -- so that's why I stopped at 63daba33ae99471175e9d7b20792324615f5999b for now | ||||
| * | SI-8002 private access for local companions | Jason Zaugg | 2013-11-24 | 1 | -0/+20 |
| We go through similar gymnastics to make companion implicits work for local class/object pairings, so we ought to be consistent when it comes to access | |||||
 |
index : scala | |
| The Scala programming language |
| summaryrefslogtreecommitdiff |