summaryrefslogtreecommitdiff
path: root/doc/License.rtf
Commit message (Expand)AuthorAgeFilesLines
* Merge 2.11.x into 2.12.xAdriaan Moors2017-04-071-2/+2
|\
| * bump copyright year to 2017Philippus Baalman2017-03-021-2/+2
* | Merge 2.11.x into 2.12.xAdriaan Moors2016-03-141-1/+1
|\|
| * Typesafe -> Lightbend in more placesSeth Tisue2016-03-041-1/+1
* | Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-2016...Jason Zaugg2016-02-251-1/+1
|\|
| * Typesafe is now LightbendSeth Tisue2016-02-241-1/+1
* | Merge branch '2.11.x' into topic/merge-2.11.x-to-2.12.x-20160210Jason Zaugg2016-02-101-2/+2
|\|
| * bump copyright year to 2016Seth Tisue2016-02-031-2/+2
* | Add partial appearance update of inheritence graphs in scaladocFelix Mulder2016-01-231-2/+0
* | Merge commit '4c6dcfe934' into 2.12.xAdriaan Moors2015-08-051-2/+2
|\|
| * bump copyright year to 2015Seth Tisue2015-07-171-2/+2
* | Remove further references to forkjoinJason Zaugg2015-07-151-6/+0
|/
* License formatting tweak, RTF version.Adriaan Moors2014-01-071-0/+65