Aleix Pol b618a64f51 Merge remote-tracking branch 'origin/master' into frameworks ... Conflicts: cli/kdeconnect-cli.cpp		2014-06-18 02:46:14 +02:00
..
CMakeLists.txt	Remove usage of KDE4_ variables	2014-06-18 02:39:30 +02:00
kdeconnect-cli.cpp	Merge remote-tracking branch 'origin/master' into frameworks	2014-06-18 02:46:14 +02:00
Messages.sh	Translated sendfileitemaction and the CLI	2014-06-17 22:21:58 +02:00