[Pkg-cli-apps-commits] [smuxi] 02/05: Merge tag 'upstream/0.11_rc2'

[Mirco Bauer]

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

meebey pushed a commit to branch master
in repository smuxi.

commit 5ffa94054675c548de68c6e1516604a670e03bd1
Merge: 73b0d46 1fb9a2c
Author: Mirco Bauer <meebey at meebey.net>
Date:   Sun Feb 16 20:02:47 2014 +0100

    Merge tag 'upstream/0.11_rc2'
    
    Upstream version 0.11~rc2

 Makefile.am                                        |   4 +
 Makefile.in                                        |   9 +-
 aclocal.m4                                         |   6 +-
 configure                                          |  32 +-
 configure.ac                                       |   2 +-
 lib/Makefile.am                                    |   2 +-
 lib/Makefile.in                                    |   4 +-
 .../src/IrcConnection/IrcConnection.cs             |   2 +
 lib/StarkSoftProxy/HttpProxyClient.cs              |   2 +-
 .../Twitterizer2/Core/OptionalProperties.cs        |   6 +-
 .../Twitterizer2/Methods/Tweets/TwitterStatus.cs   |   4 +-
 lib/Twitterizer/Twitterizer2/Twitterizer2.csproj   |   2 -
 libtool.m4                                         |  12 +-
 ltmain.sh                                          |   4 +-
 missing                                            |   4 +-
 src/AssemblyVersion.cs                             |   2 +-
 src/Common/Defines.cs                              |   4 +-
 src/Common/Makefile.in                             |   2 +-
 src/Common/NDesk.Options.cs                        |   2 +-
 src/Engine-Campfire/Makefile.in                    |   2 +-
 src/Engine-IRC/Makefile.in                         |   2 +-
 src/Engine-IRC/Protocols/Irc/IrcMessageBuilder.cs  |   6 +-
 src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs |  39 ++-
 src/Engine-JabbR/JabbrProtocolManager.cs           |  24 +-
 src/Engine-JabbR/Makefile.in                       |   2 +-
 src/Engine-Twitter/Makefile.in                     |   2 +-
 .../Protocols/Twitter/TwitterProtocolManager.cs    |   7 +-
 src/Engine-XMPP/Config/XmppServerModel.cs          |  11 -
 src/Engine-XMPP/Makefile.am                        |   2 +-
 src/Engine-XMPP/Makefile.in                        |   4 +-
 .../Protocols/Xmpp/FacebookProtocolManager.cs}     |  27 +-
 src/Engine-XMPP/Protocols/Xmpp/IQ/OwnMessage.cs    |  85 -----
 .../Protocols/Xmpp/XmppProtocolManager.cs          | 110 ++-----
 src/Engine/CommandModel.cs                         |   2 +-
 src/Engine/Config/Config.cs                        |  44 ++-
 src/Engine/Config/MessageBuilderSettings.cs        | 343 +++++++++++++++++++++
 src/Engine/Config/MessagePatternListController.cs  | 160 ++++++++++
 src/Engine/Config/MessagePatternModel.cs           | 134 ++++++++
 src/Engine/Config/ServerModel.cs                   |  27 +-
 .../Hooks/Environments/CommandHookEnvironment.cs   |   1 +
 ...HookEnvironment.cs => PersonHookEnvironment.cs} |  21 +-
 .../Environments/ProtocolManagerHookEnvironment.cs |   1 +
 src/Engine/Hooks/HookRunner.cs                     |   2 +-
 src/Engine/Makefile.am                             |   5 +-
 src/Engine/Makefile.in                             |   7 +-
 src/Engine/Messages/MessageBuilder.cs              | 129 ++++++--
 src/Engine/Messages/MessageModel.cs                |   3 +-
 src/Engine/Messages/MessageParser.cs               | 161 ----------
 src/Engine/Messages/UrlMessagePartModel.cs         |  79 ++---
 src/Engine/Protocols/ProtocolManagerBase.cs        |  18 +-
 src/Engine/Protocols/ProtocolManagerFactory.cs     |   5 +-
 src/Engine/Session.cs                              | 233 ++++++++++++--
 src/Frontend-Curses/Makefile.in                    |   2 +-
 src/Frontend-GNOME-IRC/IrcPersonChatView.cs        |  34 +-
 src/Frontend-GNOME-IRC/Makefile.am                 |   1 +
 src/Frontend-GNOME-IRC/Makefile.in                 |   3 +-
 src/Frontend-GNOME-Twitter/Makefile.in             |   2 +-
 src/Frontend-GNOME-XMPP/Makefile.in                |   2 +-
 src/Frontend-GNOME/AboutDialog.cs                  |  10 +-
 src/Frontend-GNOME/ChatViewManager.cs              |   6 +
 src/Frontend-GNOME/Entry.cs                        |   1 +
 src/Frontend-GNOME/Frontend.cs                     |  10 +-
 src/Frontend-GNOME/MainWindow.cs                   |  12 +-
 src/Frontend-GNOME/Makefile.in                     |   2 +-
 src/Frontend-GNOME/Notebook.cs                     |   1 +
 src/Frontend-GNOME/Views/ChatTreeView.cs           |  61 +++-
 src/Frontend-GNOME/Views/Chats/ChatView.cs         |  24 +-
 src/Frontend-GNOME/Views/Chats/GroupChatView.cs    |   2 +-
 src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs |  14 +-
 src/Frontend-GNOME/Views/MenuWidget.cs             |  11 +-
 src/Frontend-GNOME/Views/MessageTextView.cs        |  15 +-
 src/Frontend-GNOME/Views/ServerWidget.cs           |  83 ++++-
 .../gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs   | 194 +++++++-----
 src/Frontend-GNOME/gtk-gui/gui.stetic              | 108 ++++++-
 src/Frontend-STFL/Makefile.in                      |   2 +-
 src/Frontend-STFL/STFL/Makefile.in                 |   2 +-
 src/Frontend-SWF/Makefile.in                       |   2 +-
 src/Frontend-Test/Makefile.in                      |   2 +-
 src/Frontend/CommandManager.cs                     | 165 +++++++++-
 src/Frontend/Makefile.in                           |   2 +-
 src/Frontend/SshTunnelManager.cs                   |   7 +-
 src/Makefile.in                                    |   2 +-
 src/Server/Makefile.in                             |   2 +-
 src/smuxi-win32.nsis.in                            |   4 +
 84 files changed, 1906 insertions(+), 685 deletions(-)

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