summaryrefslogtreecommitdiff
path: root/project/BuildSettings.scala
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan@lightbend.com>2017-04-07 16:33:48 -0700
committerAdriaan Moors <adriaan@lightbend.com>2017-04-07 16:33:48 -0700
commitf21bcb841e823fb37585027d1d258a255011082b (patch)
tree829bf1ab2b88c5ffd93316da99659dd85c9fb787 /project/BuildSettings.scala
parentaf74c54a19fd29ba246288372f6fbf41cef2bfdd (diff)
parent011cc7ec86105640a6d606998f769986630fb62a (diff)
downloadscala-f21bcb841e823fb37585027d1d258a255011082b.tar.gz
scala-f21bcb841e823fb37585027d1d258a255011082b.tar.bz2
scala-f21bcb841e823fb37585027d1d258a255011082b.zip
Merge 2.11.x into 2.12.x
Include 011cc7e Merge pull request #5699 from SethTisue/mima-0.1.14
Diffstat (limited to 'project/BuildSettings.scala')
0 files changed, 0 insertions, 0 deletions