kdeconnect-kde/urlhandler
Albert Vaca 84bba9429f Merge branch 'master' into 1.x
# Conflicts:
#	core/backends/lan/downloadjob.cpp
#	core/backends/lan/downloadjob.h
#	core/filetransferjob.cpp
#	core/filetransferjob.h
#	plugins/notifications/sendreplydialog.cpp
#	plugins/notifications/sendreplydialog.h
#	plugins/telephony/sendsmsdialog.cpp
#	plugins/telephony/sendsmsdialog.h
2017-09-03 22:05:54 +02:00
..
CMakeLists.txt Introduce a URL handler and offer handling tel:/// urls 2017-06-09 13:42:16 +02:00
dialog.ui Introduce a URL handler and offer handling tel:/// urls 2017-06-09 13:42:16 +02:00
kdeconnect-handler.cpp Introduce a URL handler and offer handling tel:/// urls 2017-06-09 13:42:16 +02:00
Messages.sh Introduce a URL handler and offer handling tel:/// urls 2017-06-09 13:42:16 +02:00
org.kde.kdeconnect.telhandler.desktop Merge branch 'master' into 1.x 2017-09-03 22:05:54 +02:00