[Pkg-cli-apps-commits] [monodevelop-database] 03/03: Merge tag 'upstream/5.5.0.227+dfsg'

[Jo Shields]

This is an automated email from the git hooks/post-receive script.

directhex pushed a commit to branch master
in repository monodevelop-database.

commit 8a77d5f3a8327eed3b9b1710d42fca54fc27bf99
Merge: fa24bde 8b2c23c
Author: Jo Shields <jo.shields at xamarin.com>
Date:   Thu Oct 9 16:08:29 2014 +0100

    Merge tag 'upstream/5.5.0.227+dfsg'
    
    Upstream version 5.5.0.227+dfsg
    
    Conflicts:
    	INSTALL
    	Makefile.in
    	MonoDevelop.Database.CodeGenerator/Makefile.in
    	MonoDevelop.Database.CodeGenerator/MonoDevelop.Database.CodeGenerator.addin.xml
    	MonoDevelop.Database.Components/Makefile.in
    	MonoDevelop.Database.Components/MonoDevelop.Database.Components.addin.xml
    	MonoDevelop.Database.ConnectionManager/Makefile.in
    	MonoDevelop.Database.ConnectionManager/MonoDevelop.Database.ConnectionManager.addin.xml
    	MonoDevelop.Database.Designer/Makefile.in
    	MonoDevelop.Database.Designer/MonoDevelop.Database.Designer.addin.xml
    	MonoDevelop.Database.Query/Makefile.in
    	MonoDevelop.Database.Query/MonoDevelop.Database.Query.addin.xml
    	MonoDevelop.Database.Sql.MySql/Makefile.in
    	MonoDevelop.Database.Sql.MySql/MonoDevelop.Database.Sql.MySql.addin.xml
    	MonoDevelop.Database.Sql.Npgsql/Makefile.in
    	MonoDevelop.Database.Sql.Npgsql/MonoDevelop.Database.Sql.Npgsql.addin.xml
    	MonoDevelop.Database.Sql.SqlServer/Makefile.in
    	MonoDevelop.Database.Sql.SqlServer/MonoDevelop.Database.Sql.SqlServer.addin.xml
    	MonoDevelop.Database.Sql.Sqlite/Makefile.in
    	MonoDevelop.Database.Sql.Sqlite/MonoDevelop.Database.Sql.Sqlite.addin.xml
    	MonoDevelop.Database.Sql/Makefile.in
    	MonoDevelop.Database.Sql/MonoDevelop.Database.Sql.addin.xml
    	aclocal.m4
    	configure
    	configure.in
    	missing
    	po/Makefile.in

 INSTALL                                            |   6 +-
 Makefile.in                                        | 285 +++++++-------
 MonoDevelop.Database.CodeGenerator/Makefile.in     | 103 +++--
 .../MonoDevelop.Database.CodeGenerator.addin.xml   |  12 +-
 MonoDevelop.Database.Components/Makefile.in        | 103 +++--
 .../MonoDevelop.Database.Components.addin.xml      |  10 +-
 .../Widgets/DataGrid/Views/ImageVisualizerView.cs  |   2 +-
 .../Widgets/ProjectDirectoryComboBox.cs            |  19 +-
 .../Widgets/SelectSchemaWidget.cs                  |   7 +-
 MonoDevelop.Database.ConnectionManager/Makefile.in | 103 +++--
 ...onoDevelop.Database.ConnectionManager.addin.xml |  14 +-
 .../NodeBuilders/AggregatesNodeBuilder.cs          |   6 +-
 .../NodeBuilders/ColumnNodeBuilder.cs              |   6 +-
 .../NodeBuilders/ColumnsNodeBuilder.cs             |   6 +-
 .../ConnectionContextCollectionNodeBuilder.cs      |   6 +-
 .../NodeBuilders/ConnectionContextNodeBuilder.cs   |  15 +-
 .../NodeBuilders/ConstraintNodeBuilder.cs          |   6 +-
 .../NodeBuilders/ConstraintsNodeBuilder.cs         |   6 +-
 .../NodeBuilders/GroupsNodeBuilder.cs              |   6 +-
 .../NodeBuilders/LanguagesNodeBuilder.cs           |   6 +-
 .../NodeBuilders/OperatorsNodeBuilder.cs           |   6 +-
 .../NodeBuilders/ParameterNodeBuilder.cs           |   6 +-
 .../NodeBuilders/ParametersNodeBuilder.cs          |   6 +-
 .../NodeBuilders/ProcedureNodeBuilder.cs           |   8 +-
 .../NodeBuilders/ProceduresNodeBuilder.cs          |   6 +-
 .../NodeBuilders/RolesNodeBuilder.cs               |   6 +-
 .../NodeBuilders/RulesNodeBuilder.cs               |   6 +-
 .../NodeBuilders/SequencesNodeBuilder.cs           |   6 +-
 .../NodeBuilders/TableNodeBuilder.cs               |   6 +-
 .../NodeBuilders/TablesNodeBuilder.cs              |   6 +-
 .../NodeBuilders/TriggersNodeBuilder.cs            |   6 +-
 .../NodeBuilders/TypesNodeBuilder.cs               |   6 +-
 .../NodeBuilders/UserNodeBuilder.cs                |   6 +-
 .../NodeBuilders/UsersNodeBuilder.cs               |   6 +-
 .../NodeBuilders/ViewNodeBuilder.cs                |   6 +-
 .../NodeBuilders/ViewsNodeBuilder.cs               |   6 +-
 MonoDevelop.Database.Designer/Makefile.in          | 103 +++--
 .../MonoDevelop.Database.Designer.addin.xml        |   8 +-
 MonoDevelop.Database.Query/Makefile.in             | 106 ++++--
 .../MonoDevelop.Database.Query.addin.xml           |  10 +-
 MonoDevelop.Database.Sql.MySql/Makefile.in         | 103 +++--
 .../MonoDevelop.Database.Sql.MySql.addin.xml       |  14 +-
 MonoDevelop.Database.Sql.Npgsql/Makefile.in        | 103 +++--
 .../MonoDevelop.Database.Sql.Npgsql.addin.xml      |  14 +-
 MonoDevelop.Database.Sql.SqlServer/Makefile.in     | 103 +++--
 .../MonoDevelop.Database.Sql.SqlServer.addin.xml   |  14 +-
 MonoDevelop.Database.Sql.Sqlite/Makefile.in        | 103 +++--
 .../MonoDevelop.Database.Sql.Sqlite.addin.xml      |  14 +-
 MonoDevelop.Database.Sql/Makefile.in               | 103 +++--
 .../MonoDevelop.Database.Sql.addin.xml             |   4 +-
 aclocal.m4                                         | 414 ++++++++++++---------
 configure                                          | 282 ++++++++++----
 configure.in                                       |   6 +-
 missing                                            | 405 ++++++++------------
 po/Makefile.in                                     | 102 +++--
 55 files changed, 1692 insertions(+), 1144 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/monodevelop-database.git