Wei Wang dc8b5010a0 Merge branch 'sort-dependencies' into dev ... Conflicts: src/Microsoft.AspNet.Mvc.Core/project.json src/Microsoft.AspNet.Mvc.Razor.Host/project.json src/Microsoft.AspNet.Mvc.Razor/project.json		2014-05-08 11:16:25 -07:00
samples/MvcSample.Web	Sort dependencies and remove duplicates in dependencies	2014-05-07 18:24:04 -07:00
src	Merge branch 'sort-dependencies' into dev	2014-05-08 11:16:25 -07:00
test	Merge branch 'sort-dependencies' into dev	2014-05-08 11:16:25 -07:00
.gitattributes	…
.gitignore	Updating build scripts	2014-05-02 14:54:34 -07:00
Mvc.sln	Renaming WebFx.sln to Mvc.sln as part of rename	2014-05-08 09:48:53 -07:00
NuGet.Config	…
build.cmd	Updating build scripts	2014-05-02 15:07:38 -07:00
build.sh	Added build.sh	2014-04-27 17:00:45 -07:00
global.json	…
makefile.shade	…