Albert Vaca
|
a303b73238
|
Merge branch 'master' into frameworks
Conflicts:
cli/kdeconnect-cli.cpp
core/CMakeLists.txt
plasmoid/package/contents/ui/FullRepresentation.qml
plugins/ping/pingplugin.cpp
|
2014-07-01 23:59:38 +02:00 |
|
Ahmed Ibrahim Khalil
|
d14b4411cd
|
Implementation of mousepad plugin
CCMAIL: ahmedibrahimkhali@gmail.com
|
2014-06-27 15:43:34 +02:00 |
|
Aleix Pol
|
349a42cf16
|
Port libraries to translation domains
|
2014-06-18 02:49:07 +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 |
|