Josh Suereth 89091ca4fc Merge remote-tracking branch 'origin/0.13.5' into wip/fix-doc-generation ...

Conflicts:
	project/Sbt.scala

2014-05-28 09:09:51 -04:00

..

build.properties

sbt 0.13.2

2014-05-01 12:05:52 -04:00

Docs.scala

added scalariform

2014-05-01 12:50:07 -04:00

Formatting.scala

added scalariform

2014-05-01 12:50:07 -04:00

p.sbt

added scalariform

2014-05-01 12:50:07 -04:00

Proguard.scala

added scalariform

2014-05-01 12:50:07 -04:00

Release.scala

added scalariform

2014-05-01 12:50:07 -04:00

Sbt.scala

0.13.5 release.

2014-05-27 09:35:32 -04:00

SiteMap.scala

added scalariform

2014-05-01 12:50:07 -04:00

Status.scala

added scalariform

2014-05-01 12:50:07 -04:00

Sxr.scala

added scalariform

2014-05-01 12:50:07 -04:00

Transform.scala

added scalariform

2014-05-01 12:50:07 -04:00

Util.scala

Merge remote-tracking branch 'origin/0.13.5' into wip/fix-doc-generation

2014-05-28 09:09:51 -04:00