diff options
author | Seth Tisue <seth@tisue.net> | 2016-03-09 18:35:09 -0500 |
---|---|---|
committer | Seth Tisue <seth@tisue.net> | 2016-03-09 18:35:09 -0500 |
commit | 22b79055a054c0095daf94fe5368042d509a1127 (patch) | |
tree | ed1370740dcfa2a691b338df05d1b3065eb7734e /doc/License.rtf | |
parent | bd4926fc01c5854fd1e228ac584fbc57529c2429 (diff) | |
parent | fd7a15973d197d53b9c45dd06cb121372577e3f6 (diff) | |
download | scala-22b79055a054c0095daf94fe5368042d509a1127.tar.gz scala-22b79055a054c0095daf94fe5368042d509a1127.tar.bz2 scala-22b79055a054c0095daf94fe5368042d509a1127.zip |
Merge branch '2.11.x' into newer-akka
Diffstat (limited to 'doc/License.rtf')
0 files changed, 0 insertions, 0 deletions