From 3ddb9785c7b3a0d8ab570f4d79682fecdecb40d1 Mon Sep 17 00:00:00 2001 From: Shannon Deminick Date: Wed, 10 Oct 2012 20:04:11 +0500 Subject: [PATCH] added missing codebehinds. updated ignore file. --- .hgignore | 15 +++++++----- .../umbraco/masterpages/UmbracoPage.master.cs | 11 +++++++++ .../UmbracoPage.master.designer.cs | 24 +++++++++++++++++++ 3 files changed, 44 insertions(+), 6 deletions(-) create mode 100644 src/Umbraco.Web.UI/umbraco/masterpages/UmbracoPage.master.cs create mode 100644 src/Umbraco.Web.UI/umbraco/masterpages/UmbracoPage.master.designer.cs diff --git a/.hgignore b/.hgignore index 6dff0fc474..f59589f44c 100644 --- a/.hgignore +++ b/.hgignore @@ -27,12 +27,15 @@ umbraco\presentation\usercontrols\* umbraco\presentation\scripts\* umbraco\presentation\fonts\* umbraco\presentation\css\* -glob:*App_Code\* -glob:*App_Data\* -glob:*media\* -glob:*masterpages\* -glob:*macroScripts\* -glob:*xslt\* + +src\Umbraco.Web.UI\css\* +src\Umbraco.Web.UI\App_Code\* +src\Umbraco.Web.UI\App_Data\* +src\Umbraco.Tests\App_Data\* +src\Umbraco.Web.UI\media\* +src\Umbraco.Web.UI\masterpages\* +src\Umbraco.Web.UI\macroScripts\* +src\Umbraco.Web.UI\xslt\* umbraco\presentation\umbraco\plugins\uComponents\uComponentsInstaller.ascx umbraco\presentation\packages\uComponents\MultiNodePicker\CustomTreeService.asmx diff --git a/src/Umbraco.Web.UI/umbraco/masterpages/UmbracoPage.master.cs b/src/Umbraco.Web.UI/umbraco/masterpages/UmbracoPage.master.cs new file mode 100644 index 0000000000..b2c2597f21 --- /dev/null +++ b/src/Umbraco.Web.UI/umbraco/masterpages/UmbracoPage.master.cs @@ -0,0 +1,11 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; + +namespace Umbraco.Web.UI.Umbraco.Masterpages +{ + public partial class UmbracoPage : global::umbraco.presentation.masterpages.umbracoPage + { + } +} \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/masterpages/UmbracoPage.master.designer.cs b/src/Umbraco.Web.UI/umbraco/masterpages/UmbracoPage.master.designer.cs new file mode 100644 index 0000000000..ddc5d12ca0 --- /dev/null +++ b/src/Umbraco.Web.UI/umbraco/masterpages/UmbracoPage.master.designer.cs @@ -0,0 +1,24 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Umbraco.Web.UI.Umbraco.Masterpages { + + + public partial class UmbracoPage { + + /// + /// JsInclude10 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::ClientDependency.Core.Controls.JsInclude JsInclude10; + } +}