yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0

Browse Source
This commit is contained in:
Shannon
2013-08-21 17:55:31 +10:00
parent 5581af2d25 6c9f4c6353
commit ed68f2d28f
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
View File

@@ -403,12 +403,6 @@
<Compile Include="Install\Title.ascx.designer.cs">
<DependentUpon>Title.ascx</DependentUpon>
</Compile>
<Compile Include="MasterPages\Site1.Master.cs">
<DependentUpon>Site1.Master</DependentUpon>
</Compile>
<Compile Include="MasterPages\Site1.Master.designer.cs">
<DependentUpon>Site1.Master</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Umbraco\Controls\ContentTypeControlNew.ascx.cs">
<DependentUpon>ContentTypeControlNew.ascx</DependentUpon>
@@ -663,7 +657,6 @@
<None Include="Config\Dashboard.Release.config">
<DependentUpon>Dashboard.config</DependentUpon>
</None>
<Content Include="MasterPages\Site1.Master" />
<None Include="packages.config" />
<None Include="Umbraco\Config\Create\UI.Release.xml">
<DependentUpon>UI.xml</DependentUpon>
@@ -2607,6 +2600,7 @@
<Folder Include="App_Plugins\MyPackage\PropertyEditors\Css\" />
<Folder Include="Css\" />
<Folder Include="MacroScripts\" />
<Folder Include="MasterPages\" />
<Folder Include="Media\" />
<Folder Include="Scripts\" />
<Folder Include="Umbraco\assets\" />