summaryrefslogtreecommitdiff
path: root/src/scaladoc
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2016-03-14 11:47:04 -0700
committerAdriaan Moors <adriaan.moors@typesafe.com>2016-03-14 11:47:04 -0700
commit827b6f3b1d3e96bf838ed70fdb839c6c57672758 (patch)
treec2ad5795f1fc7935a543018854264d3f431df2cd /src/scaladoc
parentcbba68fb6085f238097fbf1635046051bd7c6889 (diff)
parentfd7a15973d197d53b9c45dd06cb121372577e3f6 (diff)
downloadscala-827b6f3b1d3e96bf838ed70fdb839c6c57672758.tar.gz
scala-827b6f3b1d3e96bf838ed70fdb839c6c57672758.tar.bz2
scala-827b6f3b1d3e96bf838ed70fdb839c6c57672758.zip
Skip merging 2.11.x's #5025 into 2.12.x
Diffstat (limited to 'src/scaladoc')
0 files changed, 0 insertions, 0 deletions