Merge commit 'refs/pull/140' into w/update-to-sbt-1.0

Browse Source

I merged these changes without actually applying them to keep authorship
information about the changes that were proposed by Masse Guillaume of
Scala Center.

On the other side of the merge I added lots of small changes which were
either inspired or just plainly copied from the ones merged in here.

In the diff you can see which changes were not taken over.

...

This commit is contained in:

Johannes Rudolph 2017-10-24 17:50:12 +02:00

parent 57356c5b54 66f801bf92

commit 0c59e1ba34

No known key found for this signature in database

GPG Key ID: 52AF1C9ABD77E6E5

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available