← Back to branch summary

~tiagosh/telephony-service/ussd

~tiagosh/telephony-service/ussd

« back to all changes in this revision

Viewing changes to indicator/textchannelobserver.cpp

Committer: Gustavo Pichorim Boiko
Date: 2014-03-07 18:33:45 UTC
mfrom: (765.2.13 telephony-service)
Revision ID: gustavo.boiko@canonical.com-20140307183345-q3mgn0nsk7jvqmn5

Merge latest changes from trunk.

files modified:
CMakeLists.txt

approver/CMakeLists.txt

approver/greetercontacts.cpp

debian/changelog

debian/control

handler/Handler.xml

handler/callhandler.cpp

handler/callhandler.h

handler/handlerdbus.cpp

handler/handlerdbus.h

indicator/CMakeLists.txt

indicator/messagingmenu.cpp

indicator/textchannelobserver.cpp

libtelephonyservice/CMakeLists.txt

libtelephonyservice/callmanager.cpp

libtelephonyservice/callmanager.h

libtelephonyservice/ringtone.cpp

libtelephonyservice/ringtone.h

Show diffs side-by-side

added added

removed removed

indicator/textchannelobserver.cpp

33

33

#include <TelepathyQt/ReceivedMessage>

34

34

#include <QContactAvatar>

35

35

#include <QContactFetchRequest>

36

#include <QContactFilter>

36

37

#include <QContactPhoneNumber>

37

38

#include <QImage>

38

39

Older »