=== modified file 'debian/messaging-app.install'
--- debian/messaging-app.install	2014-08-11 22:22:59 +0000
+++ debian/messaging-app.install	2014-08-17 14:26:34 +0000
@@ -8,4 +8,5 @@
 usr/share/messaging-app/3rd_party
 usr/share/messaging-app/MMS/*.qml
 usr/share/messaging-app/Dialogs/*.qml
+usr/share/messaging-app/emoji/*.png
 usr/bin/*messaging-app*

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-07-16 15:26:33 +0000
+++ src/CMakeLists.txt	2014-08-17 14:26:34 +0000
@@ -2,10 +2,12 @@
 
 set(messaging_app_HDRS
     messagingapplication.h
+    emoji.h
     )
 
 set(messaging_app_SRCS
     messagingapplication.cpp
+    emoji.cpp
     main.cpp
     )
 

=== added file 'src/emoji.cpp'
--- src/emoji.cpp	1970-01-01 00:00:00 +0000
+++ src/emoji.cpp	2014-08-17 14:26:34 +0000
@@ -0,0 +1,247 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This file is part of messaging-app.
+ *
+ * messaging-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * messaging-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include "emoji.h"
+#include <QStringList>
+
+#define IMAGE_SIZE  32
+
+
+EmojiMap::EmojiMap(QObject *parent)
+    : QObject(parent)
+{
+}
+
+QString EmojiMap::fromUtf8(const QString &value, const QString &imagePrefix)
+{
+    if (m_utf8Map.isEmpty()) {
+        initUtf8Map();
+    }
+
+    std::wstring result;
+    std::wstring wString = value.toStdWString();
+    for (int i=0; i < wString.length(); i++) {
+        wchar_t c = wString.at(i);
+        QByteArray imageName = m_utf8Map.value(c, "");
+        if (!imageName.isEmpty()) {
+            QString imgTag = QString("<img src=\"%1/%2_%3.png\">").arg(imagePrefix).arg(QString(imageName)).arg(IMAGE_SIZE);
+            result.append(imgTag.toStdWString());
+        } else {
+            result.push_back(c);
+        }
+    }
+    return QString::fromStdWString(result);
+}
+
+QString EmojiMap::asciiToUtf8(const QString &value)
+{
+    if (m_asciiToUtf8Map.isEmpty()) {
+        initAsciiMap();
+    }
+
+    QStringList words = value.split(" ");
+    std::wstring result;
+    Q_FOREACH(const QString &word, words) {
+        if (m_asciiToUtf8Map.contains(word.toUtf8())) {
+            wchar_t c = m_asciiToUtf8Map.value(word.toUtf8());
+            result.push_back(c);
+        } else {
+            result.append(word.toStdWString());
+        }
+        result.push_back(' ');
+    }
+
+    return QString::fromStdWString(result).trimmed();
+}
+
+void EmojiMap::initUtf8Map()
+{
+    m_utf8Map.insert(wchar_t(0x1f300), QByteArray("cyclone"));
+    m_utf8Map.insert(wchar_t(0x1f308), QByteArray("rainbow"));
+    m_utf8Map.insert(wchar_t(0x1f30c), QByteArray("milky_way"));
+    m_utf8Map.insert(wchar_t(0x1f311), QByteArray("new_moon"));
+    m_utf8Map.insert(wchar_t(0x1f313), QByteArray("first_quarter_moon"));
+    m_utf8Map.insert(wchar_t(0x1f314), QByteArray("waxing_gibbous_moon"));
+    m_utf8Map.insert(wchar_t(0x1f315), QByteArray("full_moon"));
+    m_utf8Map.insert(wchar_t(0x1f317), QByteArray("last_quarter_moon"));
+    m_utf8Map.insert(wchar_t(0x1f319), QByteArray("crescent_moon"));
+    m_utf8Map.insert(wchar_t(0x1f320), QByteArray("shooting_star"));
+    m_utf8Map.insert(wchar_t(0x1f31b), QByteArray("moon_with_face"));
+    m_utf8Map.insert(wchar_t(0x1f31f), QByteArray("glowing_star"));
+    m_utf8Map.insert(wchar_t(0x1f335), QByteArray("cactus"));
+    m_utf8Map.insert(wchar_t(0x1f34a), QByteArray("tangerine"));
+    m_utf8Map.insert(wchar_t(0x1f355), QByteArray("pizza"));
+    m_utf8Map.insert(wchar_t(0x1f359), QByteArray("rice_ball"));
+    m_utf8Map.insert(wchar_t(0x1f365), QByteArray("fish_cake_with_swirl_design"));
+    m_utf8Map.insert(wchar_t(0x1f371), QByteArray("bento_box"));
+    m_utf8Map.insert(wchar_t(0x1f379), QByteArray("tropical_drink"));
+    m_utf8Map.insert(wchar_t(0x1f37a), QByteArray("beer_mug"));
+    m_utf8Map.insert(wchar_t(0x1f383), QByteArray("jack_o_lantern"));
+    m_utf8Map.insert(wchar_t(0x1f3a4), QByteArray("microphone"));
+    m_utf8Map.insert(wchar_t(0x1f3ae), QByteArray("video_game"));
+    m_utf8Map.insert(wchar_t(0x1f3b8), QByteArray("guitar"));
+    m_utf8Map.insert(wchar_t(0x1f3be), QByteArray("tennis_racquet_and_ball"));
+    m_utf8Map.insert(wchar_t(0x1f3c2), QByteArray("snowboarder"));
+    m_utf8Map.insert(wchar_t(0x1f3e9), QByteArray("love_hotel"));
+    m_utf8Map.insert(wchar_t(0x1f40c), QByteArray("snail"));
+    m_utf8Map.insert(wchar_t(0x1f40d), QByteArray("snake"));
+    m_utf8Map.insert(wchar_t(0x1f414), QByteArray("chicken"));
+    m_utf8Map.insert(wchar_t(0x1f417), QByteArray("boar"));
+    m_utf8Map.insert(wchar_t(0x1f418), QByteArray("elephant"));
+    m_utf8Map.insert(wchar_t(0x1f419), QByteArray("octopus"));
+    m_utf8Map.insert(wchar_t(0x1f421), QByteArray("blowfish"));
+    m_utf8Map.insert(wchar_t(0x1f423), QByteArray("hatching_chick"));
+    m_utf8Map.insert(wchar_t(0x1f427), QByteArray("penguin"));
+    m_utf8Map.insert(wchar_t(0x1f428), QByteArray("koala"));
+    m_utf8Map.insert(wchar_t(0x1f42b), QByteArray("bactrian_camel"));
+    m_utf8Map.insert(wchar_t(0x1f431), QByteArray("cat_face"));
+    m_utf8Map.insert(wchar_t(0x1f433), QByteArray("spouting_whale"));
+    m_utf8Map.insert(wchar_t(0x1f434), QByteArray("horse"));
+    m_utf8Map.insert(wchar_t(0x1f436), QByteArray("dog_face"));
+    m_utf8Map.insert(wchar_t(0x1f438), QByteArray("frog_face"));
+    m_utf8Map.insert(wchar_t(0x1f43a), QByteArray("wolf_face"));
+    m_utf8Map.insert(wchar_t(0x1f43e), QByteArray("paw_prints"));
+    m_utf8Map.insert(wchar_t(0x1f44a), QByteArray("fisted_hand_sign"));
+    m_utf8Map.insert(wchar_t(0x1f44d), QByteArray("thumbs_up_sign"));
+    m_utf8Map.insert(wchar_t(0x1f46a), QByteArray("family"));
+    m_utf8Map.insert(wchar_t(0x1f46b), QByteArray("couple_holding_hands"));
+    m_utf8Map.insert(wchar_t(0x1f46c), QByteArray("two_men_holding_hands"));
+    m_utf8Map.insert(wchar_t(0x1f46d), QByteArray("two_women_holding_hands"));
+    m_utf8Map.insert(wchar_t(0x1f478), QByteArray("princess"));
+    m_utf8Map.insert(wchar_t(0x1f47b), QByteArray("ghost"));
+    m_utf8Map.insert(wchar_t(0x1f47d), QByteArray("extraterrestrial_alien"));
+    m_utf8Map.insert(wchar_t(0x1f480), QByteArray("skull"));
+    m_utf8Map.insert(wchar_t(0x1f483), QByteArray("dancer"));
+    m_utf8Map.insert(wchar_t(0x1f48a), QByteArray("pill"));
+    m_utf8Map.insert(wchar_t(0x1f491), QByteArray("couple_with_heart"));
+    m_utf8Map.insert(wchar_t(0x1f493), QByteArray("heartbeat"));
+    m_utf8Map.insert(wchar_t(0x1f4a1), QByteArray("electric_light_bulb"));
+    m_utf8Map.insert(wchar_t(0x1f4a9), QByteArray("poop"));
+    m_utf8Map.insert(wchar_t(0x1f4ac), QByteArray("speech_balloon"));
+    m_utf8Map.insert(wchar_t(0x1f51e), QByteArray("no_one_under_eighteen_symbol"));
+    m_utf8Map.insert(wchar_t(0x1f5fb), QByteArray("mount_fuji"));
+    m_utf8Map.insert(wchar_t(0x1f600), QByteArray("grinning"));
+    m_utf8Map.insert(wchar_t(0x1f601), QByteArray("grin"));
+    m_utf8Map.insert(wchar_t(0x1f602), QByteArray("face_with_tear_of_joy"));
+    m_utf8Map.insert(wchar_t(0x1f603), QByteArray("smiley"));
+    m_utf8Map.insert(wchar_t(0x1f604), QByteArray("smile"));
+    m_utf8Map.insert(wchar_t(0x1f605), QByteArray("sweat_smile"));
+    m_utf8Map.insert(wchar_t(0x1f606), QByteArray("laughing"));
+    m_utf8Map.insert(wchar_t(0x1f609), QByteArray("wink"));
+    m_utf8Map.insert(wchar_t(0x1f60a), QByteArray("blush"));
+    m_utf8Map.insert(wchar_t(0x1f60b), QByteArray("face_savouring_delicious_food"));
+    m_utf8Map.insert(wchar_t(0x1f60c), QByteArray("relieved"));
+    m_utf8Map.insert(wchar_t(0x1f60d), QByteArray("heart_eyes"));
+    m_utf8Map.insert(wchar_t(0x1f60f), QByteArray("smirk"));
+    m_utf8Map.insert(wchar_t(0x1f611), QByteArray("expressionless"));
+    m_utf8Map.insert(wchar_t(0x1f612), QByteArray("unamused"));
+    m_utf8Map.insert(wchar_t(0x1f613), QByteArray("sweat"));
+    m_utf8Map.insert(wchar_t(0x1f614), QByteArray("pensive_face"));
+    m_utf8Map.insert(wchar_t(0x1f615), QByteArray("confused"));
+    m_utf8Map.insert(wchar_t(0x1f617), QByteArray("kissing"));
+    m_utf8Map.insert(wchar_t(0x1f618), QByteArray("kissing_heart"));
+    m_utf8Map.insert(wchar_t(0x1f619), QByteArray("kissing_smiling_eyes"));
+    m_utf8Map.insert(wchar_t(0x1f61a), QByteArray("kissing_closed_eyes"));
+    m_utf8Map.insert(wchar_t(0x1f61b), QByteArray("stuck_out_tongue"));
+    m_utf8Map.insert(wchar_t(0x1f61e), QByteArray("disappointed_face"));
+    m_utf8Map.insert(wchar_t(0x1f61f), QByteArray("worried"));
+    m_utf8Map.insert(wchar_t(0x1f620), QByteArray("angry_face"));
+    m_utf8Map.insert(wchar_t(0x1f621), QByteArray("pouting_face"));
+    m_utf8Map.insert(wchar_t(0x1f622), QByteArray("crying_face"));
+    m_utf8Map.insert(wchar_t(0x1f623), QByteArray("persevering_face"));
+    m_utf8Map.insert(wchar_t(0x1f624), QByteArray("face_with_look_of_triumph"));
+    m_utf8Map.insert(wchar_t(0x1f625), QByteArray("disappointed_but_relieved_face"));
+    m_utf8Map.insert(wchar_t(0x1f626), QByteArray("frowning"));
+    m_utf8Map.insert(wchar_t(0x1f627), QByteArray("anguished"));
+    m_utf8Map.insert(wchar_t(0x1f628), QByteArray("fearful_face"));
+    m_utf8Map.insert(wchar_t(0x1f629), QByteArray("weary_face"));
+    m_utf8Map.insert(wchar_t(0x1f62c), QByteArray("grimacing"));
+    m_utf8Map.insert(wchar_t(0x1f62d), QByteArray("loudly_crying_face"));
+    m_utf8Map.insert(wchar_t(0x1f62e), QByteArray("open_mouth"));
+    m_utf8Map.insert(wchar_t(0x1f62f), QByteArray("hushed"));
+    m_utf8Map.insert(wchar_t(0x1f630), QByteArray("face_with_open_mouth_and_cold_sweat"));
+    m_utf8Map.insert(wchar_t(0x1f632), QByteArray("astonished_face"));
+    m_utf8Map.insert(wchar_t(0x1f633), QByteArray("flushed"));
+    m_utf8Map.insert(wchar_t(0x1f634), QByteArray("sleeping"));
+    m_utf8Map.insert(wchar_t(0x1f635), QByteArray("dizzy_face"));
+    m_utf8Map.insert(wchar_t(0x1f637), QByteArray("face_with_medical_mask"));
+    m_utf8Map.insert(wchar_t(0x1f638), QByteArray("grinning_cat_face_with_smiling_eyes"));
+    m_utf8Map.insert(wchar_t(0x1f639), QByteArray("cat_face_with_tears_of_joy"));
+    m_utf8Map.insert(wchar_t(0x1f63a), QByteArray("smiling_cat_face_with_open_mouth"));
+    m_utf8Map.insert(wchar_t(0x1f63b), QByteArray("smiling_cat_face_with_heart_shaped_eyes"));
+    m_utf8Map.insert(wchar_t(0x1f63c), QByteArray("cat_face_with_wry_smile"));
+    m_utf8Map.insert(wchar_t(0x1f63d), QByteArray("kissing_cat_face_with_closed_eyes"));
+    m_utf8Map.insert(wchar_t(0x1f63e), QByteArray("pouting_cat_face"));
+    m_utf8Map.insert(wchar_t(0x1f63f), QByteArray("crying_cat_face"));
+    m_utf8Map.insert(wchar_t(0x1f640), QByteArray("weary_cat_face"));
+    m_utf8Map.insert(wchar_t(0x1f645), QByteArray("face_with_no_good_gesture"));
+    m_utf8Map.insert(wchar_t(0x1f646), QByteArray("face_with_ok_gesture"));
+    m_utf8Map.insert(wchar_t(0x1f647), QByteArray("person_bowing_deeply"));
+    m_utf8Map.insert(wchar_t(0x1f648), QByteArray("see_no_evil_monkey"));
+    m_utf8Map.insert(wchar_t(0x1f649), QByteArray("hear_no_evil_monkey"));
+    m_utf8Map.insert(wchar_t(0x1f64a), QByteArray("speak_no_evil_monkey"));
+    m_utf8Map.insert(wchar_t(0x1f64b), QByteArray("happy_person_raising_one_hand"));
+    m_utf8Map.insert(wchar_t(0x1f64c), QByteArray("person_raising_both_hands_in_celebration"));
+    m_utf8Map.insert(wchar_t(0x1f64d), QByteArray("person_frowning"));
+    m_utf8Map.insert(wchar_t(0x1f64e), QByteArray("person_with_pouting_face"));
+    m_utf8Map.insert(wchar_t(0x1f64f), QByteArray("person_with_folded_hands"));
+    m_utf8Map.insert(wchar_t(0x1f68f), QByteArray("bus_stop"));
+    m_utf8Map.insert(wchar_t(0x1f6a2), QByteArray("ship"));
+    m_utf8Map.insert(wchar_t(0x1f6b9), QByteArray("mens_symbol"));
+    m_utf8Map.insert(wchar_t(0x2600), QByteArray("sun"));
+    m_utf8Map.insert(wchar_t(0x2601), QByteArray("cloud"));
+    m_utf8Map.insert(wchar_t(0x2615), QByteArray("hot_beverage"));
+    m_utf8Map.insert(wchar_t(0x263a), QByteArray("white_smiling_face"));
+    m_utf8Map.insert(wchar_t(0x2648), QByteArray("Aries"));
+    m_utf8Map.insert(wchar_t(0x2649), QByteArray("Taurus"));
+    m_utf8Map.insert(wchar_t(0x264a), QByteArray("Gemini"));
+    m_utf8Map.insert(wchar_t(0x264b), QByteArray("Cancer"));
+    m_utf8Map.insert(wchar_t(0x264c), QByteArray("Leo"));
+    m_utf8Map.insert(wchar_t(0x264d), QByteArray("Virgo"));
+    m_utf8Map.insert(wchar_t(0x264e), QByteArray("Libra"));
+    m_utf8Map.insert(wchar_t(0x264f), QByteArray("Scorpius"));
+    m_utf8Map.insert(wchar_t(0x2650), QByteArray("Sagittarius"));
+    m_utf8Map.insert(wchar_t(0x2651), QByteArray("Capricorn"));
+    m_utf8Map.insert(wchar_t(0x2652), QByteArray("Aquarius"));
+    m_utf8Map.insert(wchar_t(0x2653), QByteArray("Pisces"));
+    m_utf8Map.insert(wchar_t(0x267f), QByteArray("wheelchair"));
+    m_utf8Map.insert(wchar_t(0x2693), QByteArray("anchor"));
+    m_utf8Map.insert(wchar_t(0x26a1), QByteArray("high_voltage_sign"));
+    m_utf8Map.insert(wchar_t(0x270c), QByteArray("victory_hand"));
+    m_utf8Map.insert(wchar_t(0x2764), QByteArray("heart"));
+    m_utf8Map.insert(wchar_t(0x3299), QByteArray("circled_ideograph_secret"));}
+
+void EmojiMap::initAsciiMap()
+{
+    m_asciiToUtf8Map.insert(QByteArray(";D"), wchar_t(0x1f602));
+    m_asciiToUtf8Map.insert(QByteArray(":)"), wchar_t(0x1f603));
+    m_asciiToUtf8Map.insert(QByteArray(":D"), wchar_t(0x1f606));
+    m_asciiToUtf8Map.insert(QByteArray(";)"), wchar_t(0x1f609));
+    m_asciiToUtf8Map.insert(QByteArray(":$"), wchar_t(0x1f60a));
+    m_asciiToUtf8Map.insert(QByteArray("(:|"), wchar_t(0x1f613));
+    m_asciiToUtf8Map.insert(QByteArray(":^)"), wchar_t(0x1f615));
+    m_asciiToUtf8Map.insert(QByteArray(":*"), wchar_t(0x1f617));
+    m_asciiToUtf8Map.insert(QByteArray(":P"), wchar_t(0x1f61b));
+    m_asciiToUtf8Map.insert(QByteArray(":'("), wchar_t(0x1f622));
+    m_asciiToUtf8Map.insert(QByteArray(":("), wchar_t(0x1f626));
+    m_asciiToUtf8Map.insert(QByteArray("X("), wchar_t(0x1f629));
+    m_asciiToUtf8Map.insert(QByteArray(":O"), wchar_t(0x1f62e));
+    m_asciiToUtf8Map.insert(QByteArray(":x"), wchar_t(0x1f62f));
+    m_asciiToUtf8Map.insert(QByteArray("Xo"), wchar_t(0x1f635));
+}

=== added file 'src/emoji.h'
--- src/emoji.h	1970-01-01 00:00:00 +0000
+++ src/emoji.h	2014-08-17 14:26:34 +0000
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This file is part of messaging-app.
+ *
+ * messaging-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * messaging-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef EMOJIMAP_H
+#define EMOJIMAP_H
+
+#include <QObject>
+#include <QHash>
+#include <QString>
+#include <QByteArray>
+#include <QChar>
+
+class EmojiMap : public QObject
+{
+    Q_OBJECT
+public:
+    EmojiMap(QObject *parent=0);
+
+    Q_INVOKABLE QString fromUtf8(const QString &value, const QString &imagePrefix);
+    Q_INVOKABLE QString asciiToUtf8(const QString &value);
+
+private:
+    QHash<wchar_t, QByteArray> m_utf8Map;
+    QHash<QByteArray, wchar_t> m_asciiToUtf8Map;
+
+    void initUtf8Map();
+    void initAsciiMap();
+};
+
+#endif

=== modified file 'src/main.cpp'
--- src/main.cpp	2014-08-08 21:38:51 +0000
+++ src/main.cpp	2014-08-17 14:26:34 +0000
@@ -24,11 +24,13 @@
 #include <QString>
 #include <QTemporaryFile>
 #include <QTextStream>
+#include <QByteArray>
 
 // libc
 #include <cerrno>
 #include <cstdlib>
 #include <cstring>
+#include <iostream>
 
 // local
 #include "messagingapplication.h"

=== modified file 'src/messagingapplication.cpp'
--- src/messagingapplication.cpp	2014-07-01 18:08:32 +0000
+++ src/messagingapplication.cpp	2014-08-17 14:26:34 +0000
@@ -17,6 +17,7 @@
  */
 
 #include "messagingapplication.h"
+#include "emoji.h"
 
 #include <QDir>
 #include <QUrl>
@@ -132,6 +133,7 @@
     m_view->setTitle("Messaging");
     m_view->rootContext()->setContextProperty("application", this);
     m_view->rootContext()->setContextProperty("i18nDirectory", I18N_DIRECTORY);
+    m_view->rootContext()->setContextProperty("Emoji", new EmojiMap(m_view));
     m_view->engine()->setBaseUrl(QUrl::fromLocalFile(messagingAppDirectory()));
 
     // check if there is a contacts backend override

=== modified file 'src/messagingapplication.h'
--- src/messagingapplication.h	2014-07-01 18:08:32 +0000
+++ src/messagingapplication.h	2014-08-17 14:26:34 +0000
@@ -23,6 +23,8 @@
 #include <QQuickView>
 #include <QGuiApplication>
 
+class EmojiMap;
+
 class MessagingApplication : public QGuiApplication
 {
     Q_OBJECT
@@ -46,6 +48,7 @@
 
 private:
     QQuickView *m_view;
+    EmojiMap *m_emojiMap;
     QString m_arg;
     bool m_applicationIsReady;
 };

=== modified file 'src/qml/CMakeLists.txt'
--- src/qml/CMakeLists.txt	2014-08-11 22:22:59 +0000
+++ src/qml/CMakeLists.txt	2014-08-17 14:26:34 +0000
@@ -17,3 +17,4 @@
 
 add_subdirectory(MMS)
 add_subdirectory(Dialogs)
+add_subdirectory(emoji)

=== modified file 'src/qml/MessageBubble.qml'
--- src/qml/MessageBubble.qml	2014-08-11 22:59:14 +0000
+++ src/qml/MessageBubble.qml	2014-08-17 14:26:34 +0000
@@ -61,7 +61,10 @@
         // check for links
         text = BaLinkify.linkify(text);
         // linkify phone numbers
-        return text.replace(phoneExp, '<a href="tel:///$1">$1</a>');
+        var newText = text.replace(phoneExp, '<a href="tel:///$1">$1</a>');
+
+        // insert emoji
+        return Emoji.fromUtf8(newText, Qt.resolvedUrl("emoji/"))
     }
 
     onMessageIncomingChanged: source = selectBubble()

=== modified file 'src/qml/Messages.qml'
--- src/qml/Messages.qml	2014-08-12 15:14:25 +0000
+++ src/qml/Messages.qml	2014-08-17 14:26:34 +0000
@@ -975,13 +975,13 @@
                         attachment.push(item.filePath)
                         newAttachments.push(attachment)
                     }
-                    chatManager.sendMMS(participants, textEntry.text, newAttachments, messages.account.accountId)
+                    chatManager.sendMMS(participants, Emoji.asciiToUtf8(textEntry.text), newAttachments, messages.account.accountId)
                     textEntry.text = ""
                     attachments.clear()
                     return
                 }
 
-                chatManager.sendMessage(participants, textEntry.text, messages.account.accountId)
+                chatManager.sendMessage(participants, Emoji.asciiToUtf8(textEntry.text), messages.account.accountId)
                 textEntry.text = ""
             }
         }

=== added directory 'src/qml/emoji'
=== added file 'src/qml/emoji/Aquarius_32.png'
Binary files src/qml/emoji/Aquarius_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/Aquarius_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/Aries_32.png'
Binary files src/qml/emoji/Aries_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/Aries_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/CMakeLists.txt'
--- src/qml/emoji/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/qml/emoji/CMakeLists.txt	2014-08-17 14:26:34 +0000
@@ -0,0 +1,5 @@
+file(GLOB EMOJI_PNG_FILES *.png)
+
+add_custom_target(messaging_app_EMOJI_IMAGES ALL SOURCES ${EMOJI_PNG_FILES})
+
+install(FILES ${EMOJI_PNG_FILES} DESTINATION ${MESSAGING_APP_DIR}/emoji)

=== added file 'src/qml/emoji/Cancer_32.png'
Binary files src/qml/emoji/Cancer_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/Cancer_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/Capricorn_32.png'
Binary files src/qml/emoji/Capricorn_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/Capricorn_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/Charlie_32.png'
Binary files src/qml/emoji/Charlie_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/Charlie_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/Gemini_32.png'
Binary files src/qml/emoji/Gemini_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/Gemini_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/Happy_FMC_32.png'
Binary files src/qml/emoji/Happy_FMC_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/Happy_FMC_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/Leo_32.png'
Binary files src/qml/emoji/Leo_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/Leo_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/Libra_32.png'
Binary files src/qml/emoji/Libra_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/Libra_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/Pisces_32.png'
Binary files src/qml/emoji/Pisces_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/Pisces_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/Sagittarius_32.png'
Binary files src/qml/emoji/Sagittarius_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/Sagittarius_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/Scorpius_32.png'
Binary files src/qml/emoji/Scorpius_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/Scorpius_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/Taurus_32.png'
Binary files src/qml/emoji/Taurus_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/Taurus_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/Virgo_32.png'
Binary files src/qml/emoji/Virgo_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/Virgo_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/anchor_32.png'
Binary files src/qml/emoji/anchor_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/anchor_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/angry_face_32.png'
Binary files src/qml/emoji/angry_face_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/angry_face_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/anguished_32.png'
Binary files src/qml/emoji/anguished_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/anguished_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/apple_of_discord_32.png'
Binary files src/qml/emoji/apple_of_discord_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/apple_of_discord_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/astonished_face_32.png'
Binary files src/qml/emoji/astonished_face_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/astonished_face_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/bactrian_camel_32.png'
Binary files src/qml/emoji/bactrian_camel_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/bactrian_camel_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/beer_mug_32.png'
Binary files src/qml/emoji/beer_mug_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/beer_mug_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/bento_box_32.png'
Binary files src/qml/emoji/bento_box_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/bento_box_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/blowfish_32.png'
Binary files src/qml/emoji/blowfish_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/blowfish_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/blush_32.png'
Binary files src/qml/emoji/blush_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/blush_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/boar_32.png'
Binary files src/qml/emoji/boar_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/boar_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/bowtie_32.png'
Binary files src/qml/emoji/bowtie_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/bowtie_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/bus_stop_32.png'
Binary files src/qml/emoji/bus_stop_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/bus_stop_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/cactus_32.png'
Binary files src/qml/emoji/cactus_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/cactus_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/cat_face_32.png'
Binary files src/qml/emoji/cat_face_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/cat_face_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/cat_face_with_tears_of_joy_32.png'
Binary files src/qml/emoji/cat_face_with_tears_of_joy_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/cat_face_with_tears_of_joy_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/cat_face_with_wry_smile_32.png'
Binary files src/qml/emoji/cat_face_with_wry_smile_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/cat_face_with_wry_smile_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/chicken_32.png'
Binary files src/qml/emoji/chicken_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/chicken_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/circled_ideograph_secret_32.png'
Binary files src/qml/emoji/circled_ideograph_secret_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/circled_ideograph_secret_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/cloud_32.png'
Binary files src/qml/emoji/cloud_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/cloud_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/confused_32.png'
Binary files src/qml/emoji/confused_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/confused_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/couple_holding_hands_32.png'
Binary files src/qml/emoji/couple_holding_hands_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/couple_holding_hands_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/couple_with_heart_32.png'
Binary files src/qml/emoji/couple_with_heart_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/couple_with_heart_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/crescent_moon_32.png'
Binary files src/qml/emoji/crescent_moon_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/crescent_moon_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/crying_cat_face_32.png'
Binary files src/qml/emoji/crying_cat_face_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/crying_cat_face_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/crying_face_32.png'
Binary files src/qml/emoji/crying_face_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/crying_face_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/cutting_lines_32.png'
Binary files src/qml/emoji/cutting_lines_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/cutting_lines_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/cyclone_32.png'
Binary files src/qml/emoji/cyclone_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/cyclone_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/disappointed_but_relieved_face_32.png'
Binary files src/qml/emoji/disappointed_but_relieved_face_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/disappointed_but_relieved_face_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/disappointed_face_32.png'
Binary files src/qml/emoji/disappointed_face_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/disappointed_face_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/dizzy_face_32.png'
Binary files src/qml/emoji/dizzy_face_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/dizzy_face_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/dog_face_32.png'
Binary files src/qml/emoji/dog_face_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/dog_face_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/drunk_32.png'
Binary files src/qml/emoji/drunk_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/drunk_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/electric_light_bulb_32.png'
Binary files src/qml/emoji/electric_light_bulb_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/electric_light_bulb_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/elephant_32.png'
Binary files src/qml/emoji/elephant_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/elephant_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/expressionless_32.png'
Binary files src/qml/emoji/expressionless_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/expressionless_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/extraterrestrial_alien_32.png'
Binary files src/qml/emoji/extraterrestrial_alien_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/extraterrestrial_alien_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/face_savouring_delicious_food_32.png'
Binary files src/qml/emoji/face_savouring_delicious_food_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/face_savouring_delicious_food_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/face_with_look_of_triumph_32.png'
Binary files src/qml/emoji/face_with_look_of_triumph_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/face_with_look_of_triumph_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/face_with_medical_mask_32.png'
Binary files src/qml/emoji/face_with_medical_mask_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/face_with_medical_mask_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/face_with_no_good_gesture_32.png'
Binary files src/qml/emoji/face_with_no_good_gesture_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/face_with_no_good_gesture_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/face_with_ok_gesture_32.png'
Binary files src/qml/emoji/face_with_ok_gesture_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/face_with_ok_gesture_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/face_with_open_mouth_and_cold_sweat_32.png'
Binary files src/qml/emoji/face_with_open_mouth_and_cold_sweat_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/face_with_open_mouth_and_cold_sweat_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/face_with_tear_of_joy_32.png'
Binary files src/qml/emoji/face_with_tear_of_joy_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/face_with_tear_of_joy_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/family_32.png'
Binary files src/qml/emoji/family_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/family_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/family_daughters_32.png'
Binary files src/qml/emoji/family_daughters_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/family_daughters_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/fearful_face_32.png'
Binary files src/qml/emoji/fearful_face_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/fearful_face_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/first_quarter_moon_32.png'
Binary files src/qml/emoji/first_quarter_moon_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/first_quarter_moon_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/fish_cake_with_swirl_design_32.png'
Binary files src/qml/emoji/fish_cake_with_swirl_design_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/fish_cake_with_swirl_design_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/fisted_hand_sign_32.png'
Binary files src/qml/emoji/fisted_hand_sign_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/fisted_hand_sign_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/flushed_32.png'
Binary files src/qml/emoji/flushed_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/flushed_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/frog_face_32.png'
Binary files src/qml/emoji/frog_face_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/frog_face_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/frowning_32.png'
Binary files src/qml/emoji/frowning_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/frowning_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/full_moon_32.png'
Binary files src/qml/emoji/full_moon_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/full_moon_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/gentleman_octopus_32.png'
Binary files src/qml/emoji/gentleman_octopus_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/gentleman_octopus_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/ghost_32.png'
Binary files src/qml/emoji/ghost_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/ghost_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/glowing_star_32.png'
Binary files src/qml/emoji/glowing_star_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/glowing_star_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/grimacing_32.png'
Binary files src/qml/emoji/grimacing_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/grimacing_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/grin_32.png'
Binary files src/qml/emoji/grin_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/grin_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/grinning_32.png'
Binary files src/qml/emoji/grinning_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/grinning_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/grinning_cat_face_with_smiling_eyes_32.png'
Binary files src/qml/emoji/grinning_cat_face_with_smiling_eyes_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/grinning_cat_face_with_smiling_eyes_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/guitar_32.png'
Binary files src/qml/emoji/guitar_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/guitar_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/happy_person_raising_one_hand_32.png'
Binary files src/qml/emoji/happy_person_raising_one_hand_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/happy_person_raising_one_hand_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/hatching_chick_32.png'
Binary files src/qml/emoji/hatching_chick_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/hatching_chick_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/hear_no_evil_monkey_32.png'
Binary files src/qml/emoji/hear_no_evil_monkey_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/hear_no_evil_monkey_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/heart_32.png'
Binary files src/qml/emoji/heart_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/heart_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/heart_eyes_32.png'
Binary files src/qml/emoji/heart_eyes_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/heart_eyes_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/high_voltage_sign_32.png'
Binary files src/qml/emoji/high_voltage_sign_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/high_voltage_sign_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/horse_32.png'
Binary files src/qml/emoji/horse_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/horse_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/hot_beverage_32.png'
Binary files src/qml/emoji/hot_beverage_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/hot_beverage_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/hushed_32.png'
Binary files src/qml/emoji/hushed_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/hushed_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/jack_o_lantern_32.png'
Binary files src/qml/emoji/jack_o_lantern_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/jack_o_lantern_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/jumping_spider_32.png'
Binary files src/qml/emoji/jumping_spider_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/jumping_spider_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/kissing_32.png'
Binary files src/qml/emoji/kissing_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/kissing_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/kissing_cat_face_with_closed_eyes_32.png'
Binary files src/qml/emoji/kissing_cat_face_with_closed_eyes_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/kissing_cat_face_with_closed_eyes_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/kissing_closed_eyes_32.png'
Binary files src/qml/emoji/kissing_closed_eyes_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/kissing_closed_eyes_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/kissing_heart_32.png'
Binary files src/qml/emoji/kissing_heart_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/kissing_heart_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/kissing_smiling_eyes_32.png'
Binary files src/qml/emoji/kissing_smiling_eyes_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/kissing_smiling_eyes_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/koala_32.png'
Binary files src/qml/emoji/koala_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/koala_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/lambda_chi_alpha_32.png'
Binary files src/qml/emoji/lambda_chi_alpha_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/lambda_chi_alpha_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/last_quarter_moon_32.png'
Binary files src/qml/emoji/last_quarter_moon_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/last_quarter_moon_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/laughing_32.png'
Binary files src/qml/emoji/laughing_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/laughing_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/loudly_crying_face_32.png'
Binary files src/qml/emoji/loudly_crying_face_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/loudly_crying_face_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/love_hotel_32.png'
Binary files src/qml/emoji/love_hotel_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/love_hotel_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/mens_symbol_32.png'
Binary files src/qml/emoji/mens_symbol_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/mens_symbol_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/microphone_32.png'
Binary files src/qml/emoji/microphone_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/microphone_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/milky_way_32.png'
Binary files src/qml/emoji/milky_way_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/milky_way_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/monster_32.png'
Binary files src/qml/emoji/monster_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/monster_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/moon_with_face_32.png'
Binary files src/qml/emoji/moon_with_face_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/moon_with_face_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/mount_fuji_32.png'
Binary files src/qml/emoji/mount_fuji_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/mount_fuji_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/new_moon_32.png'
Binary files src/qml/emoji/new_moon_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/new_moon_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/ninja_32.png'
Binary files src/qml/emoji/ninja_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/ninja_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/no_one_under_eighteen_symbol_32.png'
Binary files src/qml/emoji/no_one_under_eighteen_symbol_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/no_one_under_eighteen_symbol_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/oars_32.png'
Binary files src/qml/emoji/oars_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/oars_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/octopus_32.png'
Binary files src/qml/emoji/octopus_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/octopus_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/open_mouth_32.png'
Binary files src/qml/emoji/open_mouth_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/open_mouth_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/paw_prints_32.png'
Binary files src/qml/emoji/paw_prints_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/paw_prints_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/pegasus_black_32.png'
Binary files src/qml/emoji/pegasus_black_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/pegasus_black_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/penguin_32.png'
Binary files src/qml/emoji/penguin_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/penguin_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/penguin_chick_32.png'
Binary files src/qml/emoji/penguin_chick_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/penguin_chick_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/pensive_face_32.png'
Binary files src/qml/emoji/pensive_face_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/pensive_face_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/persevering_face_32.png'
Binary files src/qml/emoji/persevering_face_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/persevering_face_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/person_bowing_deeply_32.png'
Binary files src/qml/emoji/person_bowing_deeply_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/person_bowing_deeply_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/person_frowning_32.png'
Binary files src/qml/emoji/person_frowning_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/person_frowning_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/person_raising_both_hands_in_celebration_32.png'
Binary files src/qml/emoji/person_raising_both_hands_in_celebration_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/person_raising_both_hands_in_celebration_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/person_with_folded_hands_32.png'
Binary files src/qml/emoji/person_with_folded_hands_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/person_with_folded_hands_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/person_with_pouting_face_32.png'
Binary files src/qml/emoji/person_with_pouting_face_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/person_with_pouting_face_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/phone_book_32.png'
Binary files src/qml/emoji/phone_book_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/phone_book_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/pill_32.png'
Binary files src/qml/emoji/pill_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/pill_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/pizza_32.png'
Binary files src/qml/emoji/pizza_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/pizza_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/poop_32.png'
Binary files src/qml/emoji/poop_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/poop_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/pouting_cat_face_32.png'
Binary files src/qml/emoji/pouting_cat_face_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/pouting_cat_face_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/pouting_face_32.png'
Binary files src/qml/emoji/pouting_face_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/pouting_face_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/princess_32.png'
Binary files src/qml/emoji/princess_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/princess_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/puke_32.png'
Binary files src/qml/emoji/puke_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/puke_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/puke_finger_32.png'
Binary files src/qml/emoji/puke_finger_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/puke_finger_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/quoll_32.png'
Binary files src/qml/emoji/quoll_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/quoll_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/rainbow_32.png'
Binary files src/qml/emoji/rainbow_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/rainbow_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/rainbow_sky_32.png'
Binary files src/qml/emoji/rainbow_sky_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/rainbow_sky_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/rainbow_solid_32.png'
Binary files src/qml/emoji/rainbow_solid_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/rainbow_solid_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/relaxed_32.png'
Binary files src/qml/emoji/relaxed_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/relaxed_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/relieved_32.png'
Binary files src/qml/emoji/relieved_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/relieved_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/rice_ball_32.png'
Binary files src/qml/emoji/rice_ball_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/rice_ball_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/satisfied_32.png'
Binary files src/qml/emoji/satisfied_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/satisfied_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/scuba_diver_32.png'
Binary files src/qml/emoji/scuba_diver_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/scuba_diver_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/see_no_evil_monkey_32.png'
Binary files src/qml/emoji/see_no_evil_monkey_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/see_no_evil_monkey_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/ship_32.png'
Binary files src/qml/emoji/ship_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/ship_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/shit_32.png'
Binary files src/qml/emoji/shit_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/shit_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/shooting_star_32.png'
Binary files src/qml/emoji/shooting_star_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/shooting_star_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/skull_32.png'
Binary files src/qml/emoji/skull_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/skull_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/sleeping_32.png'
Binary files src/qml/emoji/sleeping_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/sleeping_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/smile_32.png'
Binary files src/qml/emoji/smile_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/smile_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/smiley_32.png'
Binary files src/qml/emoji/smiley_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/smiley_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/smiley_confused_32.png'
Binary files src/qml/emoji/smiley_confused_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/smiley_confused_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/smiley_kissing_heart_32.png'
Binary files src/qml/emoji/smiley_kissing_heart_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/smiley_kissing_heart_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/smiley_sleeping_32.png'
Binary files src/qml/emoji/smiley_sleeping_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/smiley_sleeping_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/smiley_smile_32.png'
Binary files src/qml/emoji/smiley_smile_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/smiley_smile_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/smiling_cat_face_with_open_mouth_32.png'
Binary files src/qml/emoji/smiling_cat_face_with_open_mouth_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/smiling_cat_face_with_open_mouth_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/smiling_face_32.png'
Binary files src/qml/emoji/smiling_face_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/smiling_face_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/smirk_32.png'
Binary files src/qml/emoji/smirk_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/smirk_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/snail_32.png'
Binary files src/qml/emoji/snail_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/snail_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/snake_32.png'
Binary files src/qml/emoji/snake_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/snake_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/snake_alt_32.png'
Binary files src/qml/emoji/snake_alt_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/snake_alt_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/snowboarder_32.png'
Binary files src/qml/emoji/snowboarder_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/snowboarder_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/speak_no_evil_monkey_32.png'
Binary files src/qml/emoji/speak_no_evil_monkey_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/speak_no_evil_monkey_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/speech_balloon_32.png'
Binary files src/qml/emoji/speech_balloon_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/speech_balloon_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/spouting_whale_32.png'
Binary files src/qml/emoji/spouting_whale_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/spouting_whale_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/stuck_out_tongue_32.png'
Binary files src/qml/emoji/stuck_out_tongue_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/stuck_out_tongue_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/sun_32.png'
Binary files src/qml/emoji/sun_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/sun_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/sun_with_face_32.png'
Binary files src/qml/emoji/sun_with_face_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/sun_with_face_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/sunrise_over_mountains_32.png'
Binary files src/qml/emoji/sunrise_over_mountains_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/sunrise_over_mountains_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/sweat_32.png'
Binary files src/qml/emoji/sweat_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/sweat_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/sweat_smile_32.png'
Binary files src/qml/emoji/sweat_smile_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/sweat_smile_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/tangerine_32.png'
Binary files src/qml/emoji/tangerine_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/tangerine_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/tennis_racquet_and_ball_32.png'
Binary files src/qml/emoji/tennis_racquet_and_ball_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/tennis_racquet_and_ball_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/thumbs_up_sign_32.png'
Binary files src/qml/emoji/thumbs_up_sign_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/thumbs_up_sign_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/tropical_drink_32.png'
Binary files src/qml/emoji/tropical_drink_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/tropical_drink_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/two_men_holding_hands_32.png'
Binary files src/qml/emoji/two_men_holding_hands_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/two_men_holding_hands_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/two_men_with_heart_32.png'
Binary files src/qml/emoji/two_men_with_heart_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/two_men_with_heart_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/two_women_holding_hands_32.png'
Binary files src/qml/emoji/two_women_holding_hands_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/two_women_holding_hands_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/two_women_in_love_32.png'
Binary files src/qml/emoji/two_women_in_love_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/two_women_in_love_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/two_women_with_heart_32.png'
Binary files src/qml/emoji/two_women_with_heart_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/two_women_with_heart_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/unamused_32.png'
Binary files src/qml/emoji/unamused_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/unamused_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/victory_hand_32.png'
Binary files src/qml/emoji/victory_hand_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/victory_hand_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/video_game_32.png'
Binary files src/qml/emoji/video_game_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/video_game_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/waxing_gibbous_moon_32.png'
Binary files src/qml/emoji/waxing_gibbous_moon_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/waxing_gibbous_moon_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/weary_cat_face_32.png'
Binary files src/qml/emoji/weary_cat_face_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/weary_cat_face_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/weary_face_32.png'
Binary files src/qml/emoji/weary_face_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/weary_face_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/wheelchair_32.png'
Binary files src/qml/emoji/wheelchair_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/wheelchair_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/white_smiling_face_32.png'
Binary files src/qml/emoji/white_smiling_face_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/white_smiling_face_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/wink2_32.png'
Binary files src/qml/emoji/wink2_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/wink2_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/wink_32.png'
Binary files src/qml/emoji/wink_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/wink_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/wolf_face_32.png'
Binary files src/qml/emoji/wolf_face_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/wolf_face_32.png	2014-08-17 14:26:34 +0000 differ
=== added file 'src/qml/emoji/worried_32.png'
Binary files src/qml/emoji/worried_32.png	1970-01-01 00:00:00 +0000 and src/qml/emoji/worried_32.png	2014-08-17 14:26:34 +0000 differ