diff options
| author | Jeffrey Stedfast <jeff@xamarin.com> | 2012-10-16 21:02:00 +0400 |
|---|---|---|
| committer | Jeffrey Stedfast <jeff@xamarin.com> | 2012-10-16 21:02:00 +0400 |
| commit | 22fd799e7fc6c2e1681d31e7e31ee3eab5979601 (patch) | |
| tree | 4108f571fc10da43a2971469e9e7f74cc8198df9 /main/src/addins/ChangeLogAddIn | |
| parent | 9ac80db5d2aa49e0887b118f10386c4e5534e20b (diff) | |
| parent | 3616928615424236f222426dffbb8bdb91fc9bdf (diff) | |
Merge branch '3.0-series'
Conflicts:
.gitmodules
main/contrib/ICSharpCode.NRefactory/TypeSystem/CecilLoader.cs
main/external/Mono.Cecil
main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/MonoDevelop.AspNet.Mvc.addin.xml
main/src/addins/CBinding/CBinding.csproj
main/src/addins/CSharpBinding/CSharpBinding.csproj
main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/MonoDevelop.Debugger.Soft.AspNet.csproj
main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.csproj
main/src/core/Mono.Debugging/Mono.Debugging.Evaluation/BaseTypeViewSource.cs
main/src/core/Mono.Debugging/Mono.Debugging.Evaluation/ObjectValueAdaptor.cs
main/tests/Makefile.am
version-checks
Diffstat (limited to 'main/src/addins/ChangeLogAddIn')
| -rw-r--r-- | main/src/addins/ChangeLogAddIn/ChangeLogAddIn.addin.xml | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.addin.xml b/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.addin.xml index e4a069ac62..f7ee75ab20 100644 --- a/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.addin.xml +++ b/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.addin.xml @@ -6,22 +6,22 @@ url = "http://monodevelop.com"
description = "Add-in for working with ChangeLog files"
category = "Version Control"
- version = "3.1.0">
-
+ version = "3.0.4">
+
<Runtime>
<Import assembly="ChangeLogAddIn.dll" />
</Runtime>
<Dependencies>
- <Addin id="Core" version="3.1.0"/>
- <Addin id="Ide" version="3.1.0"/>
- <Addin id="VersionControl" version="3.1.0"/>
+ <Addin id="Core" version="3.0.4"/>
+ <Addin id="Ide" version="3.0.4"/>
+ <Addin id="VersionControl" version="3.0.4"/>
</Dependencies>
-
+
<Extension path = "/MonoDevelop/VersionControl/CommitDialogExtensions">
<Class class="MonoDevelop.ChangeLogAddIn.CommitDialogExtensionWidget" />
</Extension>
-
+
<Extension path = "/MonoDevelop/Ide/Commands">
<Command id = "MonoDevelop.ChangeLogAddIn.ChangeLogCommands.InsertEntry"
defaultHandler = "MonoDevelop.ChangeLogAddIn.InsertEntryHandler"
@@ -41,19 +41,19 @@ <Section id = "ChangeLogIntegration" _label = "ChangeLog Integration" fill="true" class="MonoDevelop.ChangeLogAddIn.ProjectOptionPanel" />
</ComplexCondition>
</Extension>
-
+
<Extension path = "/MonoDevelop/Ide/GlobalOptionsDialog/VersionControl">
<Section id = "DefaultChangeLogIntegration" _label = "ChangeLog Integration" fill="true" class="MonoDevelop.ChangeLogAddIn.ProjectOptionPanel" />
</Extension>
-
+
<Extension path = "/MonoDevelop/ProjectModel/Gui/DefaultPolicyPanels/VersionControl">
<Section id = "DefaultChangeLogIntegration" _label = "ChangeLog Integration" fill="true" class="MonoDevelop.ChangeLogAddIn.ProjectOptionPanel" />
</Extension>
-
+
<Extension path = "/MonoDevelop/ProjectModel/PolicySets/Mono" >
<Policies resource="Policies.xml"/>
</Extension>
-
+
<!-- for MD1 migration -->
<Extension path = "/MonoDevelop/ProjectModel/ExtendedProperties">
<ItemProperty class = "MonoDevelop.Projects.SolutionItem"
|