diff options
| author | Mike Krüger <mkrueger@novell.com> | 2010-06-17 15:21:18 +0400 |
|---|---|---|
| committer | Mike Krüger <mkrueger@novell.com> | 2010-06-17 15:21:18 +0400 |
| commit | 223bc1810b983137283e363312b8406472555c3a (patch) | |
| tree | be10c994853bf9c00149313cc2957671721bb9a8 /main | |
| parent | c47fafa6ffe775199155fdc7fd0a704beff8e985 (diff) | |
* Main.sln:
* configure.in:
* src/addins/Makefile.am: Adding DocFood to the solution/build system.
svn path=/trunk/monodevelop/; revision=159065
Diffstat (limited to 'main')
| -rw-r--r-- | main/ChangeLog | 5 | ||||
| -rw-r--r-- | main/Main.sln | 15 | ||||
| -rw-r--r-- | main/configure.in | 1 | ||||
| -rw-r--r-- | main/src/addins/ChangeLog | 4 | ||||
| -rw-r--r-- | main/src/addins/Makefile.am | 3 |
5 files changed, 27 insertions, 1 deletions
diff --git a/main/ChangeLog b/main/ChangeLog index dee63d5189..f43a118d7d 100644 --- a/main/ChangeLog +++ b/main/ChangeLog @@ -1,3 +1,8 @@ +2010-06-17 Mike Krüger <mkrueger@novell.com> + + * Main.sln: + * configure.in: Adding DocFood to the solution/build system. + 2010-06-14 Lluis Sanchez Gual <lluis@novell.com> * configure.in: Bump MD version. diff --git a/main/Main.sln b/main/Main.sln index bf71cec043..ace77b16b8 100644 --- a/main/Main.sln +++ b/main/Main.sln @@ -66,6 +66,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Autotools", "src\addins\CSh EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpBinding.AspNet", "src\addins\CSharpBinding\AspNet\CSharpBinding.AspNet.csproj", "{F426CBB2-77FC-4E14-9E28-E667C2D1299A}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.DocFood", "src\addins\MonoDevelop.DocFood\MonoDevelop.DocFood.csproj", "{875D389F-48D1-4D46-BFC6-998837DD6AE0}"
+EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Gettext", "src\addins\MonoDevelop.Gettext\MonoDevelop.Gettext.csproj", "{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.RegexToolkit", "src\addins\MonoDevelop.RegexToolkit\MonoDevelop.RegexToolkit.csproj", "{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}"
@@ -538,6 +540,18 @@ Global {86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.Release|Any CPU.Build.0 = Release|Any CPU
{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.Release|x86.ActiveCfg = Release|Any CPU
{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.Release|x86.Build.0 = Release|Any CPU
+ {875D389F-48D1-4D46-BFC6-998837DD6AE0}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {875D389F-48D1-4D46-BFC6-998837DD6AE0}.Debug|Any CPU.Build.0 = Debug|x86
+ {875D389F-48D1-4D46-BFC6-998837DD6AE0}.Debug|x86.ActiveCfg = Debug|x86
+ {875D389F-48D1-4D46-BFC6-998837DD6AE0}.Debug|x86.Build.0 = Debug|x86
+ {875D389F-48D1-4D46-BFC6-998837DD6AE0}.DebugMac|Any CPU.ActiveCfg = Debug|x86
+ {875D389F-48D1-4D46-BFC6-998837DD6AE0}.DebugMac|Any CPU.Build.0 = Debug|x86
+ {875D389F-48D1-4D46-BFC6-998837DD6AE0}.DebugWin32|x86.ActiveCfg = Debug|x86
+ {875D389F-48D1-4D46-BFC6-998837DD6AE0}.DebugWin32|x86.Build.0 = Debug|x86
+ {875D389F-48D1-4D46-BFC6-998837DD6AE0}.Release|Any CPU.ActiveCfg = Release|x86
+ {875D389F-48D1-4D46-BFC6-998837DD6AE0}.Release|Any CPU.Build.0 = Release|x86
+ {875D389F-48D1-4D46-BFC6-998837DD6AE0}.Release|x86.ActiveCfg = Release|x86
+ {875D389F-48D1-4D46-BFC6-998837DD6AE0}.Release|x86.Build.0 = Release|x86
{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
@@ -965,6 +979,7 @@ Global {07CC7654-27D6-421D-A64C-0FFA40456FA2} = {B480BF1B-1DCD-4288-9212-F5BEDF763797}
{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD} = {B480BF1B-1DCD-4288-9212-F5BEDF763797}
{F426CBB2-77FC-4E14-9E28-E667C2D1299A} = {B480BF1B-1DCD-4288-9212-F5BEDF763797}
+ {875D389F-48D1-4D46-BFC6-998837DD6AE0} = {B480BF1B-1DCD-4288-9212-F5BEDF763797}
{7B57882B-AD46-469B-84E7-06DF98D11468} = {49157389-0F4C-4000-88A1-D37B2AEBA941}
{B841F25D-4F6D-4E0D-885F-212B54381F28} = {49157389-0F4C-4000-88A1-D37B2AEBA941}
{9BC670A8-1851-40EC-9685-279F4C98433D} = {CC556C33-DB2D-4141-AFBF-A641EF9A1FA9}
diff --git a/main/configure.in b/main/configure.in index 054fbadf7b..d1df67d85d 100644 --- a/main/configure.in +++ b/main/configure.in @@ -378,6 +378,7 @@ src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/Makefile src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/Makefile src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.Moonlight/Makefile src/addins/MonoDevelop.HexEditor/Makefile +src/addins/MonoDevelop.DocFood/Makefile tests/Makefile tests/UnitTests/Makefile Makefile diff --git a/main/src/addins/ChangeLog b/main/src/addins/ChangeLog index f4c66b801f..2b4c0b8ec8 100644 --- a/main/src/addins/ChangeLog +++ b/main/src/addins/ChangeLog @@ -1,5 +1,9 @@ 2010-06-17 Mike Krüger <mkrueger@novell.com> + * Makefile.am: Adding DocFood to the solution/build system. + +2010-06-17 Mike Krüger <mkrueger@novell.com> + * MonoDevelop.DocFood: Checked in doc food addin. 2010-02-23 Michael Hutchinson <mhutchinson@novell.com> diff --git a/main/src/addins/Makefile.am b/main/src/addins/Makefile.am index e741789787..b96667c97c 100644 --- a/main/src/addins/Makefile.am +++ b/main/src/addins/Makefile.am @@ -30,4 +30,5 @@ SUBDIRS = \ MonoDevelop.CodeMetrics \ MonoDevelop.Debugger.Soft \ WindowsPlatform \ - MonoDevelop.HexEditor + MonoDevelop.HexEditor \
+ MonoDevelop.DocFood |