[Pkg-cli-apps-commits] [smuxi] 01/02: Merge tag 'upstream/1.0'

[Victor Seva Lopez]

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

maniac-guest pushed a commit to branch master
in repository smuxi.

commit 668b719d0e798285cbdf73b63ccf7c86d63c7a3f
Merge: 94f60be da9e908
Author: Victor Seva <linuxmaniac at torreviejawireless.org>
Date:   Mon Jul 20 11:23:26 2015 +0200

    Merge tag 'upstream/1.0'
    
    Upstream version 1.0

 po-Engine-Twitter/es.po                         |  416 ++--
 po-Engine-XMPP/es.po                            |  685 +++---
 po-Frontend-GNOME/LINGUAS                       |    1 +
 po-Frontend-GNOME/{es.po => el.po}              |  914 ++++----
 po-Frontend-GNOME/es.po                         | 2667 ++++++++++++-----------
 po-Server/es.po                                 |  282 +--
 src/Common/Defines.cs                           |    4 +-
 src/Engine/Chats/ChatModel.cs                   |    8 +-
 src/Frontend-GNOME/smuxi-frontend-gnome.desktop |    6 +
 src/Frontend-GNOME/smuxi-frontend-gnome.in      |   16 +
 src/Frontend-STFL/Makefile.am                   |    1 +
 src/Frontend-STFL/Makefile.in                   |    1 +
 src/Frontend-STFL/STFL/StflApi.cs               |  146 +-
 src/Frontend-STFL/STFL/StringOnHeap.cs          |   59 +
 14 files changed, 2837 insertions(+), 2369 deletions(-)

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