Message:
merged in 9.0.1.2 changes
----
Added : /myproject/trunk/Web/AddIns/AddInSideAdapters (Copy from path: /9_32NS/Web/AddIns/AddInSideAdapters, Revision, 51)
Replacing : /myproject/trunk/Web/AddIns/AddInSideAdapters/empty.txt (Copy from path: /9_32NS/Web/AddIns/AddInSideAdapters/empty.txt, Revision, 51)
Added : /myproject/trunk/Web/AddIns/AddInViews (Copy from path: /9_32NS/Web/AddIns/AddInViews, Revision, 51)
Replacing : /myproject/trunk/Web/AddIns/AddInViews/empty.txt (Copy from path: /9_32NS/Web/AddIns/AddInViews/empty.txt, Revision, 51)
Added : /myproject/trunk/Web/AddIns/Contracts (Copy from path: /9_32NS/Web/AddIns/Contracts, Revision, 51)
Replacing : /myproject/trunk/Web/AddIns/Contracts/empty.txt (Copy from path: /9_32NS/Web/AddIns/Contracts/empty.txt, Revision, 51)
Added : /myproject/trunk/Web/AddIns/HostSideAdapters (Copy from path: /9_32NS/Web/AddIns/HostSideAdapters, Revision, 51)
Replacing : /myproject/trunk/Web/AddIns/HostSideAdapters/empty.txt (Copy from path: /9_32NS/Web/AddIns/HostSideAdapters/empty.txt, Revision, 51)
Modified : /myproject/trunk/Web/Admin/Controls/AdminMenu.ascx.cs
Modified : /myproject/trunk/Web/Admin/Controls/CustomerGrid.ascx
Modified : /myproject/trunk/Web/Admin/Controls/appconfiglist.ascx.cs
Modified : /myproject/trunk/Web/Admin/Controls/editcustomer.ascx
Modified : /myproject/trunk/Web/Admin/Controls/editcustomer.ascx.cs
Modified : /myproject/trunk/Web/Admin/NewEntities.aspx.cs
Modified : /myproject/trunk/Web/Admin/default.aspx
Modified : /myproject/trunk/Web/Admin/deleteimage.aspx.cs
Modified : /myproject/trunk/Web/Admin/editcustomerlevel.aspx.cs
Modified : /myproject/trunk/Web/Admin/editkit2.aspx
Added : /myproject/trunk/Web/Admin/entityEditInventory.aspx (Copy from path: /9_32NS/Web/Admin/entityEditInventory.aspx, Revision, 51)
Added : /myproject/trunk/Web/Admin/entityEditInventory.aspx.cs (Copy from path: /9_32NS/Web/Admin/entityEditInventory.aspx.cs, Revision, 51)
Modified : /myproject/trunk/Web/Admin/entityEditProducts.aspx
Modified : /myproject/trunk/Web/Admin/entityEditProducts.aspx.cs
Modified : /myproject/trunk/Web/App_Code/SkinBase.cs
Modified : /myproject/trunk/Web/App_Templates/Skin_1/template.master
Modified : /myproject/trunk/Web/StringResources/admin.strings.en-US.xls
Modified : /myproject/trunk/Web/StringResources/strings.en-US.xls
Modified : /myproject/trunk/Web/bin/ASPDNSFApplication.dll
Modified : /myproject/trunk/Web/bin/AspDotNetStorefrontAdmin.dll
Modified : /myproject/trunk/Web/bin/AspDotNetStorefrontAdmin.pdb
Modified : /myproject/trunk/Web/bin/AspDotNetStorefrontCommon.dll
Modified : /myproject/trunk/Web/bin/AspDotNetStorefrontControls.dll
Modified : /myproject/trunk/Web/bin/AspDotNetStorefrontControls.pdb
Modified : /myproject/trunk/Web/bin/AspDotNetStorefrontCore.dll
Modified : /myproject/trunk/Web/bin/AspDotNetStorefrontCore.pdb
Modified : /myproject/trunk/Web/bin/AspDotNetStorefrontEventHandlers.dll
Modified : /myproject/trunk/Web/bin/AspDotNetStorefrontEventHandlers.pdb
Modified : /myproject/trunk/Web/bin/AspDotNetStorefrontGateways.dll
Modified : /myproject/trunk/Web/bin/AspDotNetStorefrontLayout.dll
Modified : /myproject/trunk/Web/bin/AspDotNetStorefrontLayout.pdb
Modified : /myproject/trunk/Web/bin/AspDotNetStorefrontWSI.dll
Modified : /myproject/trunk/Web/bin/AspDotNetStorefrontWSI.pdb
Modified : /myproject/trunk/Web/bin/HostView.dll
Modified : /myproject/trunk/Web/bin/HostView.pdb
Modified : /myproject/trunk/Web/bin/XsltObjects.dll
Modified : /myproject/trunk/Web/bin/XsltObjects.pdb
Modified : /myproject/trunk/Web/controls/XmlPackageControl.ascx.cs
Modified : /myproject/trunk/Web/kitproduct.aspx