2
0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-08-28 20:57:42 +00:00

Merge branch 'master' into filetransfer

Conflicts:
	KdeConnect/src/main/AndroidManifest.xml
This commit is contained in:
Albert Vaca 2013-09-20 17:27:59 +02:00
commit cda2f573bf

View File

@ -119,7 +119,7 @@
<activity <activity
android:theme="@style/Theme.AppCompat" android:theme="@style/Theme.AppCompat"
android:name="org.kde.kdeconnect.Plugins.FileTransferPlugin.ShareToReceiver" android:name="org.kde.kdeconnect.UserInterface.ShareToReceiver"
android:label="KDE Connect" android:label="KDE Connect"
> >
<intent-filter> <intent-filter>