[smuxi: 15/15] Merge pull request #206 from carlosmn/show-image

[Mirco M. M. Bauer <mmmbauer src gnome org>]

commit 5a59a8be3f2f3587ea8c3fc2afcb87017785390f
Merge: 4c0753a 9908218
Author: Mirco Bauer <meebey meebey net>
Date:   Tue Feb 3 01:45:08 2015 +0100

    Merge pull request #206 from carlosmn/show-image

 lib/LICENSE                                        |    7 +
 lib/emoji.json                                     |24564 ++++++++++++++++++++
 src/Common/Common.csproj                           |    4 +
 src/Common/Emojione.cs                             |   57 +
 src/Common/GenerateEmojione.cs                     |   67 +
 src/Common/GeneratedEmojione.cs                    |  738 +
 src/Common/IconCache.cs                            |  264 +
 src/Common/Makefile.am                             |    9 +-
 src/Engine/Config/MessageBuilderSettings.cs        |    7 +
 src/Frontend-GNOME/Frontend-GNOME.csproj           |    1 +
 src/Frontend-GNOME/Makefile.am                     |    1 +
 src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs |  140 +-
 src/Frontend-GNOME/Views/MessageTextView.cs        |  144 +-
 src/Frontend-GNOME/Views/Tags/EmojiTag.cs          |   48 +
 14 files changed, 25924 insertions(+), 127 deletions(-)
---