diff options
| author | Michael Hutchinson <m.j.hutchinson@gmail.com> | 2011-11-08 21:57:22 +0400 |
|---|---|---|
| committer | Michael Hutchinson <m.j.hutchinson@gmail.com> | 2011-11-08 21:57:22 +0400 |
| commit | 3d7a7f93a50819a5089e21bfedd332dc08d4f0ce (patch) | |
| tree | 0956c7d9cd3c6d2cc7344398ea6fb182952a55be /extras/MonoDevelop.AddinAuthoring | |
| parent | e51679b1a150ba564ade1510f94e9c05c4e6fa65 (diff) | |
| parent | ec035e02db5d9b6e9a2c2275d3145b44264dc546 (diff) | |
Merge remote-tracking branch 'origin/master' into macgtk
Conflicts:
extras/GtkSourceViewEditor/MonoDevelop.SourceEditor.addin.xml
main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs
main/src/core/Mono.Texteditor/Mono.TextEditor/GtkWorkarounds.cs
Diffstat (limited to 'extras/MonoDevelop.AddinAuthoring')
| -rw-r--r-- | extras/MonoDevelop.AddinAuthoring/MonoDevelop.AddinAuthoring.addin.xml | 8 | ||||
| -rwxr-xr-x | extras/MonoDevelop.AddinAuthoring/configure | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/extras/MonoDevelop.AddinAuthoring/MonoDevelop.AddinAuthoring.addin.xml b/extras/MonoDevelop.AddinAuthoring/MonoDevelop.AddinAuthoring.addin.xml index b6a740e8c6..0effd86e89 100644 --- a/extras/MonoDevelop.AddinAuthoring/MonoDevelop.AddinAuthoring.addin.xml +++ b/extras/MonoDevelop.AddinAuthoring/MonoDevelop.AddinAuthoring.addin.xml @@ -5,12 +5,12 @@ copyright = "MIT X11" url = "http://www.monodevelop.com" description = "This add-in provides utilities for creating Mono.Addins based libraries and applications" - version = "2.8.1"> + version = "2.8.2"> <Dependencies> - <Addin id="Core" version="2.8.1"/> - <Addin id="Ide" version="2.8.1"/> - <Addin id="VersionControl" version="2.8.1"/> + <Addin id="Core" version="2.8.2"/> + <Addin id="Ide" version="2.8.2"/> + <Addin id="VersionControl" version="2.8.2"/> </Dependencies> <!-- Extension Points --> diff --git a/extras/MonoDevelop.AddinAuthoring/configure b/extras/MonoDevelop.AddinAuthoring/configure index 6caff5eaa2..19a925369a 100755 --- a/extras/MonoDevelop.AddinAuthoring/configure +++ b/extras/MonoDevelop.AddinAuthoring/configure @@ -1,10 +1,10 @@ #!/bin/bash -VERSION=2.8.1 +VERSION=2.8.2 PACKAGE=monodevelop_addinauthoring prefix=/usr/local config=DEBUG configurations=" RELEASE DEBUG" -common_packages=" monodevelop;2.8.1 gtk-sharp-2.0;2.12.8 mono-addins-setup;0.4 mono-addins;0.5" +common_packages=" monodevelop;2.8.2 gtk-sharp-2.0;2.12.8 mono-addins-setup;0.4 mono-addins;0.5" usage () |