diff options
| author | Mike Krüger <mkrueger@xamarin.com> | 2011-11-02 10:03:16 +0400 |
|---|---|---|
| committer | Mike Krüger <mkrueger@xamarin.com> | 2011-11-02 10:03:16 +0400 |
| commit | f8e9e1d90d2fb0a859c5682636ee4a8a4e20271b (patch) | |
| tree | 5beda2a492ea7e26083947f2309eb5302a85491b /main/src/addins/AspNet | |
| parent | fc54ca49eda7af3e9c119256a3b583d03816e103 (diff) | |
| parent | b639f9d5574d8b4e6fadfd9012e111165af39643 (diff) | |
Merge branch 'master' into newresolver
Conflicts:
main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs
main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/CSharpSyntaxMode.cs
main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs
main/src/addins/CSharpBinding/MonoDevelop.CSharp.Resolver/TextEditorResolverProvider.cs
main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpAmbience.cs
main/src/core/MonoDevelop.Ide/ExtensionModel/MonoDevelop.Ide.addin.xml
Diffstat (limited to 'main/src/addins/AspNet')
| -rw-r--r-- | main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/MonoDevelop.AspNet.Mvc.addin.xml | 14 | ||||
| -rw-r--r-- | main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.addin.xml | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/MonoDevelop.AspNet.Mvc.addin.xml b/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/MonoDevelop.AspNet.Mvc.addin.xml index 30678226fb..a62b1657a4 100644 --- a/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/MonoDevelop.AspNet.Mvc.addin.xml +++ b/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/MonoDevelop.AspNet.Mvc.addin.xml @@ -6,7 +6,7 @@ url = "http://monodevelop.com/" description = "Support for ASP.NET MVC projects." category = "Web Development" - version = "2.8.1"> + version = "2.8.2"> <Runtime> <Import file = "Templates/Controller.xft.xml"/> @@ -23,12 +23,12 @@ </Runtime> <Dependencies> - <Addin id="Core" version="2.8.1"/> - <Addin id="Ide" version="2.8.1"/> - <Addin id="XmlEditor" version="2.8.1" /> - <Addin id="AspNet" version="2.8.1" /> - <Addin id="SourceEditor2" version="2.8.1" /> - <Addin id="TextTemplating" version="2.8.1" /> + <Addin id="Core" version="2.8.2"/> + <Addin id="Ide" version="2.8.2"/> + <Addin id="XmlEditor" version="2.8.2" /> + <Addin id="AspNet" version="2.8.2" /> + <Addin id="SourceEditor2" version="2.8.2" /> + <Addin id="TextTemplating" version="2.8.2" /> </Dependencies> <Extension path = "/MonoDevelop/ProjectModel/MSBuildItemTypes"> diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.addin.xml b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.addin.xml index 26b2aba5ce..2b430c8c11 100644 --- a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.addin.xml +++ b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.addin.xml @@ -6,7 +6,7 @@ url = "http://www.monodevelop.com/" description = "Support for ASP.NET projects, including editing, compiling, previewing and deploying to remote servers." category = "Web Development" - version = "2.8.1"> + version = "2.8.2"> <Runtime>
<Import file="Schemas/xhtml1-strict.xsd" />
@@ -15,12 +15,12 @@ </Runtime> <Dependencies> - <Addin id="Core" version="2.8.1"/> - <Addin id="Ide" version="2.8.1"/> - <Addin id="DesignerSupport" version="2.8.1"/> - <Addin id="Deployment" version="2.8.1"/> - <Addin id="XmlEditor" version="2.8.1" /> - <Addin id="SourceEditor2" version="2.8.1"/> + <Addin id="Core" version="2.8.2"/> + <Addin id="Ide" version="2.8.2"/> + <Addin id="DesignerSupport" version="2.8.2"/> + <Addin id="Deployment" version="2.8.2"/> + <Addin id="XmlEditor" version="2.8.2" /> + <Addin id="SourceEditor2" version="2.8.2"/> </Dependencies> <Extension path = "/MonoDevelop/ProjectModel/MSBuildItemTypes"> |