Albert Vaca 6b94e7faf8 Merge branch 'qmlsftp' ... Conflicts: kded/daemon.cpp		2014-02-14 13:07:52 +01:00
..
contents/ui	some fixes	2014-02-06 19:25:50 +04:00
metadata.desktop	SVN_SILENT made messages (.desktop file)	2014-02-01 04:09:05 +00:00