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

Browse Source

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

...

This commit is contained in:

Josh Suereth

2014-05-13 19:31:44 -04:00

parent 38a0c16eff b10e094223

commit f848a36b40

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

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

Diff Content Not Available