Merged 'feature/layouteditor' into 1.x.

This commit is contained in:
Daniel Stolt
2015-02-19 22:14:55 +01:00
parent d5c3a0e59f
commit 4b11d08ccd
482 changed files with 44305 additions and 5266 deletions

View File

@@ -299,6 +299,10 @@
<Content Include="Scripts\jquery-migrate-1.2.1.min.js" />
<Content Include="Scripts\colorbox\jquery.colorbox.min.js" />
<Content Include="Scripts\colorbox\jquery.colorbox.js" />
<Content Include="Scripts\jquery.cookie.js" />
<Content Include="Scripts\jquery.cookie.min.js">
<DependentUpon>jquery.cookie.js</DependentUpon>
</Content>
<Content Include="Scripts\jquery.plugin.js" />
<Content Include="Scripts\jquery.plugin.min.js" />
<Content Include="Scripts\timeentry\jquery.timeentry-ar.js" />
@@ -576,6 +580,11 @@
<ItemGroup>
<Content Include="Scripts\jquery-1.11.1.min.map" />
</ItemGroup>
<ItemGroup>
<Content Include="Scripts\jquery.cookie.min.js.map">
<DependentUpon>jquery.cookie.min.js</DependentUpon>
</Content>
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>