Commit graph

5 commits

Author SHA1 Message Date
Albert Vaca
a3decd542c Includes cleanup 2015-03-13 21:20:58 -07:00
Albert Vaca
c7c1974ea9 Merge branch 'master' into frameworks
Conflicts:
	core/backends/lan/lanlinkprovider.cpp
	plugins/ping/pingplugin.h
	plugins/telephony/telephonyplugin.cpp
2015-01-10 20:14:01 -08:00
Mikhail Ivchenko
f6e7b04514 Added a button to incoming call notifications to mute the phone ringing.
REVIEW: 121854
2015-01-05 21:58:23 -08:00
Àlex Fiestas
3b5ab5e83f Port Telephony plugin from kDebug to qCDebug 2014-09-22 00:46:41 +02:00
Aleix Pol
741abafaf7 Move the plugins into a different top-ĺevel directory
Reviewed by Albert Vaca
2014-06-14 16:34:11 +02:00
Renamed from core/plugins/telephony/telephonyplugin.h (Browse further)