Merge remote-tracking branch 'origin/0.13.5' into wip/merge-0.13.5

Browse Source

Conflicts:
	main/src/main/scala/sbt/Load.scala

...

This commit is contained in:

Josh Suereth 2014-05-16 14:04:51 -04:00

parent 9399f263f9 b10e094223

commit 7fb665d5fd

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