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.Database | |
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.Database')
15 files changed, 75 insertions, 75 deletions
diff --git a/extras/MonoDevelop.Database/MonoDevelop.Database.CodeGenerator/MonoDevelop.Database.CodeGenerator.addin.xml b/extras/MonoDevelop.Database/MonoDevelop.Database.CodeGenerator/MonoDevelop.Database.CodeGenerator.addin.xml index 1bd8d5de91..219dd910ce 100644 --- a/extras/MonoDevelop.Database/MonoDevelop.Database.CodeGenerator/MonoDevelop.Database.CodeGenerator.addin.xml +++ b/extras/MonoDevelop.Database/MonoDevelop.Database.CodeGenerator/MonoDevelop.Database.CodeGenerator.addin.xml @@ -6,7 +6,7 @@ url = "http://www.monodevelop.com" description = "Database CodeGenerator Module" category = "Database" - version = "2.8.1"> + version = "2.8.2"> <Runtime> <Import assembly="MonoDevelop.Database.CodeGenerator.dll"/> @@ -15,11 +15,11 @@ <Localizer type="Gettext" catalog="monodevelop-database"/> <Dependencies> - <Addin id="Core" version="2.8.1"/> - <Addin id="Ide" version="2.8.1"/> - <Addin id="Database.Sql" version="2.8.1"/> - <Addin id="Database.Components" version="2.8.1"/> - <Addin id="Database.Query" version="2.8.1"/> + <Addin id="Core" version="2.8.2"/> + <Addin id="Ide" version="2.8.2"/> + <Addin id="Database.Sql" version="2.8.2"/> + <Addin id="Database.Components" version="2.8.2"/> + <Addin id="Database.Query" version="2.8.2"/> </Dependencies> <Extension path = "/MonoDevelop/Ide/Commands"> diff --git a/extras/MonoDevelop.Database/MonoDevelop.Database.Components/MonoDevelop.Database.Components.addin.xml b/extras/MonoDevelop.Database/MonoDevelop.Database.Components/MonoDevelop.Database.Components.addin.xml index c28d1eb295..96dad307c5 100644 --- a/extras/MonoDevelop.Database/MonoDevelop.Database.Components/MonoDevelop.Database.Components.addin.xml +++ b/extras/MonoDevelop.Database/MonoDevelop.Database.Components/MonoDevelop.Database.Components.addin.xml @@ -6,7 +6,7 @@ url = "http://www.monodevelop.com" description = "Database Components Module" category = "Database" - version = "2.8.1"> + version = "2.8.2"> <Runtime> <Import assembly="MonoDevelop.Database.Components.dll"/> @@ -15,10 +15,10 @@ <Localizer type="Gettext" catalog="monodevelop-database"/> <Dependencies> - <Addin id="Core" version="2.8.1"/> - <Addin id="Ide" version="2.8.1"/> - <Addin id="Database.Sql" 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="Database.Sql" version="2.8.2"/> + <Addin id="SourceEditor2" version="2.8.2"/> </Dependencies> <ExtensionPoint path = "/MonoDevelop/Database/DataGrid/Renderers" name = "DataGrid renderers"> diff --git a/extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/MonoDevelop.Database.ConnectionManager.addin.xml b/extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/MonoDevelop.Database.ConnectionManager.addin.xml index 3364a27d3a..1086f75e61 100644 --- a/extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/MonoDevelop.Database.ConnectionManager.addin.xml +++ b/extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/MonoDevelop.Database.ConnectionManager.addin.xml @@ -6,7 +6,7 @@ url = "http://www.monodevelop.com" description = "Database ConnectionManager Module" category = "Database" - version = "2.8.1"> + version = "2.8.2"> <Runtime> <Import assembly="MonoDevelop.Database.ConnectionManager.dll"/> @@ -15,12 +15,12 @@ <Localizer type="Gettext" catalog="monodevelop-database"/> <Dependencies> - <Addin id="Core" version="2.8.1"/> - <Addin id="Ide" version="2.8.1"/> - <Addin id="Database.Sql" version="2.8.1"/> - <Addin id="Database.Components" version="2.8.1"/> - <Addin id="Database.Query" version="2.8.1"/> - <Addin id="Database.Designer" version="2.8.1"/> + <Addin id="Core" version="2.8.2"/> + <Addin id="Ide" version="2.8.2"/> + <Addin id="Database.Sql" version="2.8.2"/> + <Addin id="Database.Components" version="2.8.2"/> + <Addin id="Database.Query" version="2.8.2"/> + <Addin id="Database.Designer" version="2.8.2"/> </Dependencies> <Extension path = "/MonoDevelop/Ide/Pads"> diff --git a/extras/MonoDevelop.Database/MonoDevelop.Database.Designer/MonoDevelop.Database.Designer.addin.xml b/extras/MonoDevelop.Database/MonoDevelop.Database.Designer/MonoDevelop.Database.Designer.addin.xml index 6d68f68ca7..5e7a32cc36 100644 --- a/extras/MonoDevelop.Database/MonoDevelop.Database.Designer/MonoDevelop.Database.Designer.addin.xml +++ b/extras/MonoDevelop.Database/MonoDevelop.Database.Designer/MonoDevelop.Database.Designer.addin.xml @@ -6,7 +6,7 @@ url = "http://www.monodevelop.com" description = "Database Designer Module" category = "Database" - version = "2.8.1"> + version = "2.8.2"> <Runtime> <Import assembly="MonoDevelop.Database.Designer.dll"/> @@ -15,9 +15,9 @@ <Localizer type="Gettext" catalog="monodevelop-database"/> <Dependencies> - <Addin id="Core" version="2.8.1"/> - <Addin id="Ide" version="2.8.1"/> - <Addin id="Database.Sql" version="2.8.1"/> + <Addin id="Core" version="2.8.2"/> + <Addin id="Ide" version="2.8.2"/> + <Addin id="Database.Sql" version="2.8.2"/> </Dependencies> </Addin>
\ No newline at end of file diff --git a/extras/MonoDevelop.Database/MonoDevelop.Database.Query/MonoDevelop.Database.Query.addin.xml b/extras/MonoDevelop.Database/MonoDevelop.Database.Query/MonoDevelop.Database.Query.addin.xml index f71ad80756..e1fd048776 100644 --- a/extras/MonoDevelop.Database/MonoDevelop.Database.Query/MonoDevelop.Database.Query.addin.xml +++ b/extras/MonoDevelop.Database/MonoDevelop.Database.Query/MonoDevelop.Database.Query.addin.xml @@ -6,7 +6,7 @@ url = "http://www.monodevelop.com" description = "Database Query Module" category = "Database" - version = "2.8.1"> + version = "2.8.2"> <Runtime> <Import assembly="MonoDevelop.Database.Query.dll"/> @@ -15,10 +15,10 @@ <Localizer type="Gettext" catalog="monodevelop-database"/> <Dependencies> - <Addin id="Core" version="2.8.1"/> - <Addin id="Ide" version="2.8.1"/> - <Addin id="Database.Sql" version="2.8.1"/> - <Addin id="Database.Components" version="2.8.1"/> + <Addin id="Core" version="2.8.2"/> + <Addin id="Ide" version="2.8.2"/> + <Addin id="Database.Sql" version="2.8.2"/> + <Addin id="Database.Components" version="2.8.2"/> </Dependencies> diff --git a/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Firebird/MonoDevelop.Database.Sql.Firebird.addin.xml b/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Firebird/MonoDevelop.Database.Sql.Firebird.addin.xml index c10990962e..09864d4b7a 100644 --- a/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Firebird/MonoDevelop.Database.Sql.Firebird.addin.xml +++ b/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Firebird/MonoDevelop.Database.Sql.Firebird.addin.xml @@ -6,7 +6,7 @@ url = "http://www.monodevelop.com" description = "Database Module" category = "Database" - version = "2.8.1"> + version = "2.8.2"> <Runtime> <Import assembly="MonoDevelop.Database.Sql.Firebird.dll"/> @@ -15,7 +15,7 @@ <Localizer type="Gettext" catalog="monodevelop-database"/> <Dependencies> - <Addin id="MonoDevelop.Database.Sql" version="2.8.1"/> + <Addin id="MonoDevelop.Database.Sql" version="2.8.2"/> </Dependencies> <Extension path = "/Mono/Data/Sql"> diff --git a/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.MySql/MonoDevelop.Database.Sql.MySql.addin.xml b/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.MySql/MonoDevelop.Database.Sql.MySql.addin.xml index 5848e65d2e..ae2f64aecb 100644 --- a/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.MySql/MonoDevelop.Database.Sql.MySql.addin.xml +++ b/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.MySql/MonoDevelop.Database.Sql.MySql.addin.xml @@ -6,7 +6,7 @@ url = "http://www.monodevelop.com" description = "Database Module" category = "Database" - version = "2.8.1"> + version = "2.8.2"> <Runtime> <Import assembly="MonoDevelop.Database.Sql.MySql.dll"/> @@ -15,12 +15,12 @@ <Localizer type="Gettext" catalog="monodevelop-database"/> <Dependencies> - <Addin id="Core" version="2.8.1"/> - <Addin id="Ide" version="2.8.1"/> - <Addin id="Database.Sql" version="2.8.1"/> - <Addin id="Database.Components" version="2.8.1"/> - <Addin id="Database.Designer" 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="Database.Sql" version="2.8.2"/> + <Addin id="Database.Components" version="2.8.2"/> + <Addin id="Database.Designer" version="2.8.2"/> + <Addin id="SourceEditor2" version="2.8.2"/> </Dependencies> <Extension path = "/MonoDevelop/Database/Sql"> diff --git a/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Npgsql/MonoDevelop.Database.Sql.Npgsql.addin.xml b/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Npgsql/MonoDevelop.Database.Sql.Npgsql.addin.xml index b10a126319..56bba6b6b0 100644 --- a/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Npgsql/MonoDevelop.Database.Sql.Npgsql.addin.xml +++ b/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Npgsql/MonoDevelop.Database.Sql.Npgsql.addin.xml @@ -6,7 +6,7 @@ url = "http://www.monodevelop.com" description = "Database Module" category = "Database" - version = "2.8.1"> + version = "2.8.2"> <Runtime> <Import assembly="MonoDevelop.Database.Sql.Npgsql.dll"/> @@ -15,12 +15,12 @@ <Localizer type="Gettext" catalog="monodevelop-database"/> <Dependencies> - <Addin id="Core" version="2.8.1"/> - <Addin id="Ide" version="2.8.1"/> - <Addin id="Database.Sql" version="2.8.1"/> - <Addin id="Database.Components" version="2.8.1"/> - <Addin id="Database.Designer" 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="Database.Sql" version="2.8.2"/> + <Addin id="Database.Components" version="2.8.2"/> + <Addin id="Database.Designer" version="2.8.2"/> + <Addin id="SourceEditor2" version="2.8.2"/> </Dependencies> <Extension path = "/MonoDevelop/Database/Sql"> diff --git a/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Odbc/MonoDevelop.Database.Sql.Odbc.addin.xml b/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Odbc/MonoDevelop.Database.Sql.Odbc.addin.xml index 3217fdb050..7989a72413 100644 --- a/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Odbc/MonoDevelop.Database.Sql.Odbc.addin.xml +++ b/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Odbc/MonoDevelop.Database.Sql.Odbc.addin.xml @@ -6,7 +6,7 @@ url = "http://www.monodevelop.com" description = "Database Module" category = "Database" - version = "2.8.1"> + version = "2.8.2"> <Runtime> <Import assembly="MonoDevelop.Database.Sql.Odbc.dll"/> @@ -15,11 +15,11 @@ <Localizer type="Gettext" catalog="monodevelop-database"/> <Dependencies> - <Addin id="Core" version="2.8.1"/> - <Addin id="Ide" version="2.8.1"/> - <Addin id="Database.Sql" version="2.8.1"/> - <Addin id="Database.Components" version="2.8.1"/> - <Addin id="Database.Designer" version="2.8.1"/> + <Addin id="Core" version="2.8.2"/> + <Addin id="Ide" version="2.8.2"/> + <Addin id="Database.Sql" version="2.8.2"/> + <Addin id="Database.Components" version="2.8.2"/> + <Addin id="Database.Designer" version="2.8.2"/> </Dependencies> <Extension path = "/MonoDevelop/Database/Sql"> diff --git a/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Oracle/MonoDevelop.Database.Sql.Oracle.addin.xml b/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Oracle/MonoDevelop.Database.Sql.Oracle.addin.xml index d42d4142e8..0f98798b28 100644 --- a/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Oracle/MonoDevelop.Database.Sql.Oracle.addin.xml +++ b/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Oracle/MonoDevelop.Database.Sql.Oracle.addin.xml @@ -6,7 +6,7 @@ url = "http://www.monodevelop.com" description = "Database Module" category = "Database" - version = "2.8.1"> + version = "2.8.2"> <Runtime> <Import assembly="MonoDevelop.Database.Sql.Oracle.dll"/> @@ -15,11 +15,11 @@ <Localizer type="Gettext" catalog="monodevelop-database"/> <Dependencies> - <Addin id="Core" version="2.8.1"/> - <Addin id="Ide" version="2.8.1"/> - <Addin id="Database.Sql" version="2.8.1"/> - <Addin id="Database.Components" version="2.8.1"/> - <Addin id="Database.Designer" version="2.8.1"/> + <Addin id="Core" version="2.8.2"/> + <Addin id="Ide" version="2.8.2"/> + <Addin id="Database.Sql" version="2.8.2"/> + <Addin id="Database.Components" version="2.8.2"/> + <Addin id="Database.Designer" version="2.8.2"/> </Dependencies> <Extension path = "/MonoDevelop/Database/Sql"> diff --git a/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.SqlServer/MonoDevelop.Database.Sql.SqlServer.addin.xml b/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.SqlServer/MonoDevelop.Database.Sql.SqlServer.addin.xml index b46a3f5f88..4105effbe9 100644 --- a/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.SqlServer/MonoDevelop.Database.Sql.SqlServer.addin.xml +++ b/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.SqlServer/MonoDevelop.Database.Sql.SqlServer.addin.xml @@ -6,7 +6,7 @@ url = "http://www.monodevelop.com" description = "Database Module" category = "Database" - version = "2.8.1"> + version = "2.8.2"> <Runtime> <Import assembly="MonoDevelop.Database.Sql.SqlServer.dll"/> @@ -15,12 +15,12 @@ <Localizer type="Gettext" catalog="monodevelop-database"/> <Dependencies> - <Addin id="Core" version="2.8.1"/> - <Addin id="Ide" version="2.8.1"/> - <Addin id="Database.Sql" version="2.8.1"/> - <Addin id="Database.Components" version="2.8.1"/> - <Addin id="Database.Designer" 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="Database.Sql" version="2.8.2"/> + <Addin id="Database.Components" version="2.8.2"/> + <Addin id="Database.Designer" version="2.8.2"/> + <Addin id="SourceEditor2" version="2.8.2"/> </Dependencies> <Extension path = "/MonoDevelop/Database/Sql"> diff --git a/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/MonoDevelop.Database.Sql.Sqlite.addin.xml b/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/MonoDevelop.Database.Sql.Sqlite.addin.xml index 69d0f868a5..cc51554b61 100644 --- a/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/MonoDevelop.Database.Sql.Sqlite.addin.xml +++ b/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/MonoDevelop.Database.Sql.Sqlite.addin.xml @@ -6,7 +6,7 @@ url = "http://www.monodevelop.com" description = "Database Module" category = "Database" - version = "2.8.1"> + version = "2.8.2"> <Runtime> <Import assembly="MonoDevelop.Database.Sql.Sqlite.dll"/> @@ -15,12 +15,12 @@ <Localizer type="Gettext" catalog="monodevelop-database"/> <Dependencies> - <Addin id="Core" version="2.8.1"/> - <Addin id="Ide" version="2.8.1"/> - <Addin id="Database.Sql" version="2.8.1"/> - <Addin id="Database.Components" version="2.8.1"/> - <Addin id="Database.Designer" 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="Database.Sql" version="2.8.2"/> + <Addin id="Database.Components" version="2.8.2"/> + <Addin id="Database.Designer" version="2.8.2"/> + <Addin id="SourceEditor2" version="2.8.2"/> </Dependencies> <Extension path = "/MonoDevelop/Database/Sql"> diff --git a/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sybase/MonoDevelop.Database.Sql.Sybase.addin.xml b/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sybase/MonoDevelop.Database.Sql.Sybase.addin.xml index 641da2cbc1..07213105f7 100644 --- a/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sybase/MonoDevelop.Database.Sql.Sybase.addin.xml +++ b/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sybase/MonoDevelop.Database.Sql.Sybase.addin.xml @@ -6,7 +6,7 @@ url = "http://www.monodevelop.com" description = "Database Module" category = "Database" - version = "2.8.1"> + version = "2.8.2"> <Runtime> <Import assembly="MonoDevelop.Database.Sql.Sybase.dll"/> @@ -15,7 +15,7 @@ <Localizer type="Gettext" catalog="monodevelop-database"/> <Dependencies> - <Addin id="MonoDevelop.Database.Sql" version="2.8.1"/> + <Addin id="MonoDevelop.Database.Sql" version="2.8.2"/> </Dependencies> <Extension path = "/Mono/Data/Sql"> diff --git a/extras/MonoDevelop.Database/MonoDevelop.Database.Sql/MonoDevelop.Database.Sql.addin.xml b/extras/MonoDevelop.Database/MonoDevelop.Database.Sql/MonoDevelop.Database.Sql.addin.xml index 142937a414..1ed137d90d 100644 --- a/extras/MonoDevelop.Database/MonoDevelop.Database.Sql/MonoDevelop.Database.Sql.addin.xml +++ b/extras/MonoDevelop.Database/MonoDevelop.Database.Sql/MonoDevelop.Database.Sql.addin.xml @@ -6,14 +6,14 @@ url = "http://www.monodevelop.com" description = "Database Module" category = "Database" - version = "2.8.1"> + version = "2.8.2"> <Runtime> <Import assembly="MonoDevelop.Database.Sql.dll"/> </Runtime> <Dependencies> - <Addin id="Core" version="2.8.1"/> + <Addin id="Core" version="2.8.2"/> </Dependencies> <Localizer type="Gettext" catalog="monodevelop-database"/> diff --git a/extras/MonoDevelop.Database/configure.in b/extras/MonoDevelop.Database/configure.in index 75adfae4e6..7a2a3acca1 100644 --- a/extras/MonoDevelop.Database/configure.in +++ b/extras/MonoDevelop.Database/configure.in @@ -1,4 +1,4 @@ -AC_INIT([monodevelop-database], 2.8.1, [monodevelop-list@lists.ximian.com]) +AC_INIT([monodevelop-database], 2.8.2, [monodevelop-list@lists.ximian.com]) AC_PREREQ(2.53) AM_INIT_AUTOMAKE([1.9 tar-ustar]) AM_MAINTAINER_MODE @@ -52,7 +52,7 @@ fi dnl hard dependencies MONOADDINS_REQUIRED_VERSION=0.4 -MONODEVELOP_REQUIRED_VERSION=2.8.1 +MONODEVELOP_REQUIRED_VERSION=2.8.2 GTKSHARP_REQUIRED_VERSION=2.12.8 PKG_CHECK_MODULES(MONO_ADDINS, mono-addins >= $MONOADDINS_REQUIRED_VERSION) |