From 0bee8e8313354b97d8c57f816f6a2a2c6d4bf3fc Mon Sep 17 00:00:00 2001
From: Sebastien Ros <none@none>
Date: Thu, 19 Jan 2012 12:44:23 -0800
Subject: [PATCH] Integrating Orchard.Fields

--HG--
branch : 1.x
---
 .hgsub          |  3 ++-
 .hgsubstate     |  1 +
 src/Orchard.sln | 13 +++++++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/.hgsub b/.hgsub
index 7508220f8..9526d07de 100644
--- a/.hgsub
+++ b/.hgsub
@@ -3,4 +3,5 @@ src/Orchard.Web/Modules/Orchard.Forms = https://hg01.codeplex.com/orchardforms
 src/Orchard.Web/Modules/Orchard.Rules = https://hg01.codeplex.com/orchardrules
 src/Orchard.Web/Modules/Orchard.Tokens = https://hg01.codeplex.com/orchardtokens
 src/Orchard.Web/Modules/Orchard.TaskLease = https://hg01.codeplex.com/orchardtasklease
-src/Orchard.Web/Modules/Orchard.Projections = https://hg01.codeplex.com/orchardprojections
\ No newline at end of file
+src/Orchard.Web/Modules/Orchard.Projections = https://hg01.codeplex.com/orchardprojections
+src/orchard.web/modules/orchard.Fields = https://hg01.codeplex.com/orchardfields
\ No newline at end of file
diff --git a/.hgsubstate b/.hgsubstate
index 430c4c818..251872c3e 100644
--- a/.hgsubstate
+++ b/.hgsubstate
@@ -3,3 +3,4 @@ e41852ffdb08fad05bffc7b3bd03266b31376f48 src/Orchard.Web/Modules/Orchard.Project
 f2a3984789ebe5caf2822ccb9e1d2c953add9c35 src/Orchard.Web/Modules/Orchard.Rules
 ce578373f907c0a55fd91229a344f0755f290174 src/Orchard.Web/Modules/Orchard.TaskLease
 cf73534c335f39e6d9695c2a0ce64c426d1be9f2 src/Orchard.Web/Modules/Orchard.Tokens
+911db5c16c29c442314b5839d68e0acd8e1f81e4 src/orchard.web/modules/orchard.Fields
diff --git a/src/Orchard.sln b/src/Orchard.sln
index 12fe2eb3b..247dc789d 100644
--- a/src/Orchard.sln
+++ b/src/Orchard.sln
@@ -130,6 +130,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Projections", "Orch
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Projections.Tests", "Orchard.Web\Modules\Orchard.Projections\Tests\Orchard.Projections.Tests.csproj", "{2969635F-D9C3-4D01-890D-437B46659690}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Fields", "Orchard.Web\Modules\Orchard.Fields\Orchard.Fields.csproj", "{3787DDE5-E5C8-4841-BDA7-DCB325388064}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		CodeCoverage|Any CPU = CodeCoverage|Any CPU
@@ -700,6 +702,16 @@ Global
 		{2969635F-D9C3-4D01-890D-437B46659690}.FxCop|Any CPU.Build.0 = Release|Any CPU
 		{2969635F-D9C3-4D01-890D-437B46659690}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2969635F-D9C3-4D01-890D-437B46659690}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3787DDE5-E5C8-4841-BDA7-DCB325388064}.CodeCoverage|Any CPU.ActiveCfg = Release|Any CPU
+		{3787DDE5-E5C8-4841-BDA7-DCB325388064}.CodeCoverage|Any CPU.Build.0 = Release|Any CPU
+		{3787DDE5-E5C8-4841-BDA7-DCB325388064}.Coverage|Any CPU.ActiveCfg = Release|Any CPU
+		{3787DDE5-E5C8-4841-BDA7-DCB325388064}.Coverage|Any CPU.Build.0 = Release|Any CPU
+		{3787DDE5-E5C8-4841-BDA7-DCB325388064}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3787DDE5-E5C8-4841-BDA7-DCB325388064}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3787DDE5-E5C8-4841-BDA7-DCB325388064}.FxCop|Any CPU.ActiveCfg = Release|Any CPU
+		{3787DDE5-E5C8-4841-BDA7-DCB325388064}.FxCop|Any CPU.Build.0 = Release|Any CPU
+		{3787DDE5-E5C8-4841-BDA7-DCB325388064}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3787DDE5-E5C8-4841-BDA7-DCB325388064}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -746,6 +758,7 @@ Global
 		{3158C928-888C-4A84-8BC1-4A8257489538} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5}
 		{3F72A4E9-7B72-4260-B010-C16EC54F9BAF} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5}
 		{5531E894-D259-45A3-AA61-26DBE720C1CE} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5}
+		{3787DDE5-E5C8-4841-BDA7-DCB325388064} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5}
 		{ABC826D4-2FA1-4F2F-87DE-E6095F653810} = {74E681ED-FECC-4034-B9BD-01B0BB1BDECA}
 		{F112851D-B023-4746-B6B1-8D2E5AD8F7AA} = {74E681ED-FECC-4034-B9BD-01B0BB1BDECA}
 		{6CB3EB30-F725-45C0-9742-42599BA8E8D2} = {74E681ED-FECC-4034-B9BD-01B0BB1BDECA}