lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge recipe -> dev

Browse Source 
--HG--
branch : dev
This commit is contained in:
Suha Can
2011-02-22 17:39:29 -08:00
parent 7e910edb51 1d316b321c
commit 7842a0f79b
72 changed files with 2574 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Orchard.sln
View File

@@ -107,6 +107,7 @@ EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.DesignerTools", "Orchard.Web\Modules\Orchard.DesignerTools\Orchard.DesignerTools.csproj", "{4A4595EF-6C37-4F99-96ED-4AE0B9E438D3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.MediaPicker", "Orchard.Web\Modules\Orchard.MediaPicker\Orchard.MediaPicker.csproj", "{43D0EC0B-1955-4566-8D31-7B9102DA1703}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Recipes", "Orchard.Web\Modules\Orchard.Recipes\Orchard.Recipes.csproj", "{FC1D74E8-7A4D-48F4-83DE-95C6173780C4}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -571,6 +572,16 @@ Global
{43D0EC0B-1955-4566-8D31-7B9102DA1703}.FxCop|Any CPU.Build.0 = Release|Any CPU
{43D0EC0B-1955-4566-8D31-7B9102DA1703}.Release|Any CPU.ActiveCfg = Release|Any CPU
{43D0EC0B-1955-4566-8D31-7B9102DA1703}.Release|Any CPU.Build.0 = Release|Any CPU
{FC1D74E8-7A4D-48F4-83DE-95C6173780C4}.CodeCoverage|Any CPU.ActiveCfg = Release|Any CPU
{FC1D74E8-7A4D-48F4-83DE-95C6173780C4}.CodeCoverage|Any CPU.Build.0 = Release|Any CPU
{FC1D74E8-7A4D-48F4-83DE-95C6173780C4}.Coverage|Any CPU.ActiveCfg = Release|Any CPU
{FC1D74E8-7A4D-48F4-83DE-95C6173780C4}.Coverage|Any CPU.Build.0 = Release|Any CPU
{FC1D74E8-7A4D-48F4-83DE-95C6173780C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FC1D74E8-7A4D-48F4-83DE-95C6173780C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FC1D74E8-7A4D-48F4-83DE-95C6173780C4}.FxCop|Any CPU.ActiveCfg = Release|Any CPU
{FC1D74E8-7A4D-48F4-83DE-95C6173780C4}.FxCop|Any CPU.Build.0 = Release|Any CPU
{FC1D74E8-7A4D-48F4-83DE-95C6173780C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FC1D74E8-7A4D-48F4-83DE-95C6173780C4}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -608,6 +619,7 @@ Global
{99002B65-86F7-415E-BF4A-381AA8AB9CCC} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5}
{4A4595EF-6C37-4F99-96ED-4AE0B9E438D3} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5}
{43D0EC0B-1955-4566-8D31-7B9102DA1703} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5}
{FC1D74E8-7A4D-48F4-83DE-95C6173780C4} = {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}