Raataar/Sprueche-TV-Star
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Neue Hintergründe

Browse Source
This commit is contained in:
Carsten Hilmer
2016-04-08 00:16:42 +02:00
parent da958c7ac4
commit 204cdf70d1
253 changed files with 417 additions and 427 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/build/outputs/logs/manifest-merger-debug-report.txt
View File

@@ -41,7 +41,7 @@ MERGED from com.android.support:support-v4:21.0.3:16:5
ADDED from AndroidManifest.xml:15:13
android:name
ADDED from AndroidManifest.xml:11:13
activity#com.raataar.sapientia_tvstar.MainActivity
activity#com.raataar.sprueche_tvstar.MainActivity
ADDED from AndroidManifest.xml:17:9
android:label
ADDED from AndroidManifest.xml:19:17
@@ -57,7 +57,7 @@ category#android.intent.category.LAUNCHER
ADDED from AndroidManifest.xml:23:17
android:name
ADDED from AndroidManifest.xml:23:27
activity#com.raataar.sapientia_tvstar.KategorieActivity
activity#com.raataar.sprueche_tvstar.KategorieActivity
ADDED from AndroidManifest.xml:26:9
android:label
ADDED from AndroidManifest.xml:28:17
@@ -71,7 +71,7 @@ ADDED from AndroidManifest.xml:31:13
ADDED from AndroidManifest.xml:32:21
android:value
ADDED from AndroidManifest.xml:33:21
activity#com.raataar.sapientia_tvstar.KategorieByIDActivity
activity#com.raataar.sprueche_tvstar.KategorieByIDActivity
ADDED from AndroidManifest.xml:35:9
android:label
ADDED from AndroidManifest.xml:37:17
@@ -79,13 +79,13 @@ ADDED from AndroidManifest.xml:35:9
ADDED from AndroidManifest.xml:38:17
android:name
ADDED from AndroidManifest.xml:36:17
activity#com.raataar.sapientia_tvstar.ZitatActivity
activity#com.raataar.sprueche_tvstar.ZitatActivity
ADDED from AndroidManifest.xml:44:9
android:label
ADDED from AndroidManifest.xml:46:17
android:name
ADDED from AndroidManifest.xml:45:17
activity#com.raataar.sapientia_tvstar.ZufallZitatActivity
activity#com.raataar.sprueche_tvstar.ZufallZitatActivity
ADDED from AndroidManifest.xml:48:9
android:label
ADDED from AndroidManifest.xml:50:17
@@ -93,7 +93,7 @@ ADDED from AndroidManifest.xml:48:9
ADDED from AndroidManifest.xml:51:17
android:name
ADDED from AndroidManifest.xml:49:17
activity#com.raataar.sapientia_tvstar.NewsActivity
activity#com.raataar.sprueche_tvstar.NewsActivity
ADDED from AndroidManifest.xml:57:9
android:label
ADDED from AndroidManifest.xml:59:13
@@ -101,7 +101,7 @@ ADDED from AndroidManifest.xml:57:9
ADDED from AndroidManifest.xml:60:13
android:name
ADDED from AndroidManifest.xml:58:13
activity#com.raataar.sapientia_tvstar.AutorenActivity
activity#com.raataar.sprueche_tvstar.AutorenActivity
ADDED from AndroidManifest.xml:66:9
android:label
ADDED from AndroidManifest.xml:68:17
@@ -109,7 +109,7 @@ ADDED from AndroidManifest.xml:66:9
ADDED from AndroidManifest.xml:69:17
android:name
ADDED from AndroidManifest.xml:67:17
activity#com.raataar.sapientia_tvstar.AutorenByIDActivity
activity#com.raataar.sprueche_tvstar.AutorenByIDActivity
ADDED from AndroidManifest.xml:75:9
android:label
ADDED from AndroidManifest.xml:77:17
@@ -117,7 +117,7 @@ ADDED from AndroidManifest.xml:75:9
ADDED from AndroidManifest.xml:78:17
android:name
ADDED from AndroidManifest.xml:76:17
activity#com.raataar.sapientia_tvstar.SuchenActivity
activity#com.raataar.sprueche_tvstar.SuchenActivity
ADDED from AndroidManifest.xml:84:9
android:label
ADDED from AndroidManifest.xml:86:17
@@ -125,7 +125,7 @@ ADDED from AndroidManifest.xml:84:9
ADDED from AndroidManifest.xml:87:17
android:name
ADDED from AndroidManifest.xml:85:17
activity#com.raataar.sapientia_tvstar.SuchenByIDActivity
activity#com.raataar.sprueche_tvstar.SuchenByIDActivity
ADDED from AndroidManifest.xml:93:9
android:label
ADDED from AndroidManifest.xml:95:17

28
app/build/outputs/logs/manifest-merger-release-report.txt
View File

@@ -1,6 +1,8 @@
-- Merging decision tree log ---
manifest
ADDED from AndroidManifest.xml:2:1
xmlns:android
ADDED from AndroidManifest.xml:2:11
package
ADDED from AndroidManifest.xml:3:11
INJECTED from AndroidManifest.xml:0:0
@@ -11,8 +13,6 @@ ADDED from AndroidManifest.xml:2:1
ADDED from AndroidManifest.xml:4:11
INJECTED from AndroidManifest.xml:0:0
INJECTED from AndroidManifest.xml:0:0
xmlns:android
ADDED from AndroidManifest.xml:2:11
uses-sdk
ADDED from AndroidManifest.xml:6:5
MERGED from com.android.support:multidex:1.0.1:18:5
@@ -41,7 +41,7 @@ MERGED from com.android.support:support-v4:21.0.3:16:5
ADDED from AndroidManifest.xml:15:13
android:name
ADDED from AndroidManifest.xml:11:13
activity#com.raataar.weisheiten_sports.MainActivity
activity#com.raataar.sprueche_tvstar.MainActivity
ADDED from AndroidManifest.xml:17:9
android:label
ADDED from AndroidManifest.xml:19:17
@@ -57,7 +57,7 @@ category#android.intent.category.LAUNCHER
ADDED from AndroidManifest.xml:23:17
android:name
ADDED from AndroidManifest.xml:23:27
activity#com.raataar.weisheiten_sports.KategorieActivity
activity#com.raataar.sprueche_tvstar.KategorieActivity
ADDED from AndroidManifest.xml:26:9
android:label
ADDED from AndroidManifest.xml:28:17
@@ -67,11 +67,11 @@ ADDED from AndroidManifest.xml:26:9
ADDED from AndroidManifest.xml:27:17
meta-data#android.support.PARENT_ACTIVITY
ADDED from AndroidManifest.xml:31:13
android:value
ADDED from AndroidManifest.xml:33:21
android:name
ADDED from AndroidManifest.xml:32:21
activity#com.raataar.weisheiten_sports.KategorieByIDActivity
android:value
ADDED from AndroidManifest.xml:33:21
activity#com.raataar.sprueche_tvstar.KategorieByIDActivity
ADDED from AndroidManifest.xml:35:9
android:label
ADDED from AndroidManifest.xml:37:17
@@ -79,13 +79,13 @@ ADDED from AndroidManifest.xml:35:9
ADDED from AndroidManifest.xml:38:17
android:name
ADDED from AndroidManifest.xml:36:17
activity#com.raataar.weisheiten_sports.ZitatActivity
activity#com.raataar.sprueche_tvstar.ZitatActivity
ADDED from AndroidManifest.xml:44:9
android:label
ADDED from AndroidManifest.xml:46:17
android:name
ADDED from AndroidManifest.xml:45:17
activity#com.raataar.weisheiten_sports.ZufallZitatActivity
activity#com.raataar.sprueche_tvstar.ZufallZitatActivity
ADDED from AndroidManifest.xml:48:9
android:label
ADDED from AndroidManifest.xml:50:17
@@ -93,7 +93,7 @@ ADDED from AndroidManifest.xml:48:9
ADDED from AndroidManifest.xml:51:17
android:name
ADDED from AndroidManifest.xml:49:17
activity#com.raataar.weisheiten_sports.NewsActivity
activity#com.raataar.sprueche_tvstar.NewsActivity
ADDED from AndroidManifest.xml:57:9
android:label
ADDED from AndroidManifest.xml:59:13
@@ -101,7 +101,7 @@ ADDED from AndroidManifest.xml:57:9
ADDED from AndroidManifest.xml:60:13
android:name
ADDED from AndroidManifest.xml:58:13
activity#com.raataar.weisheiten_sports.AutorenActivity
activity#com.raataar.sprueche_tvstar.AutorenActivity
ADDED from AndroidManifest.xml:66:9
android:label
ADDED from AndroidManifest.xml:68:17
@@ -109,7 +109,7 @@ ADDED from AndroidManifest.xml:66:9
ADDED from AndroidManifest.xml:69:17
android:name
ADDED from AndroidManifest.xml:67:17
activity#com.raataar.weisheiten_sports.AutorenByIDActivity
activity#com.raataar.sprueche_tvstar.AutorenByIDActivity
ADDED from AndroidManifest.xml:75:9
android:label
ADDED from AndroidManifest.xml:77:17
@@ -117,7 +117,7 @@ ADDED from AndroidManifest.xml:75:9
ADDED from AndroidManifest.xml:78:17
android:name
ADDED from AndroidManifest.xml:76:17
activity#com.raataar.weisheiten_sports.SuchenActivity
activity#com.raataar.sprueche_tvstar.SuchenActivity
ADDED from AndroidManifest.xml:84:9
android:label
ADDED from AndroidManifest.xml:86:17
@@ -125,7 +125,7 @@ ADDED from AndroidManifest.xml:84:9
ADDED from AndroidManifest.xml:87:17
android:name
ADDED from AndroidManifest.xml:85:17
activity#com.raataar.weisheiten_sports.SuchenByIDActivity
activity#com.raataar.sprueche_tvstar.SuchenByIDActivity
ADDED from AndroidManifest.xml:93:9
android:label
ADDED from AndroidManifest.xml:95:17