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 |
|
Tomáš Zelina
|
0782682f7b
|
Implemented current/total time and progress slider in MPRIS plugin
CCMAIL: zelitomas@gmail.com.
|
2014-12-13 14:43:09 -08:00 |
|
Àlex Fiestas
|
1e9df65d50
|
Port mpris from kDebug to qCDebug
|
2014-09-22 00:44:47 +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 |
|