summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcyBerta <richy@cyborgsociety.org>2013-11-10 23:37:25 +0100
committercyBerta <richy@cyborgsociety.org>2013-11-10 23:37:25 +0100
commit2cc19682a050e7675de4a8e5f470c7a408b46ac4 (patch)
treed86a6acae0af635222965baaf91cb0d885d3b65b
parentfe6ff2c1250f75419f9fb54752eda2bdc6302f5d (diff)
parent5e43d1ea5436af16f227a98fee495f707c885a96 (diff)
Merge remote-tracking branch 'base/develop' into develop-merge
Conflicts: AndroidManifest.xml
-rw-r--r--AndroidManifest.xml3
1 files changed, 0 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 679c540b..df0eba0f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -142,12 +142,10 @@
android:grantUriPermissions="true" />
<activity
-
android:name="se.leap.bitmaskclient.Dashboard"
android:label="@string/title_activity_dashboard"
android:uiOptions="splitActionBarWhenNarrow" >
-
<intent-filter android:label="@string/app_name">
<action android:name="android.intent.action.MAIN" />
@@ -158,7 +156,6 @@
android:name="se.leap.bitmaskclient.ConfigurationWizard"
android:label="@string/title_activity_configuration_wizard"
android:uiOptions="splitActionBarWhenNarrow" >
-
</activity>
<service android:name="se.leap.bitmaskclient.EIP" android:exported="false">