Raataar/Wolle-Rosen-Kaufen
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of 192.168.178.250:raataar/wolle-rosen-kaufen

Browse Source 
Conflicts:
	platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock
	platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin
	platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin
	platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin
	platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin
	platforms/android/.idea/workspace.xml
	platforms/android/assets/www/templates/tab-buys.html
	platforms/android/build/intermediates/assets/debug/www/templates/tab-buys.html
	platforms/android/build/intermediates/gradle_project_sync_data.bin
	platforms/android/build/intermediates/res/resources-debug.ap_
	platforms/android/build/outputs/apk/android-debug-unaligned.apk
	platforms/android/build/outputs/apk/android-debug.apk
	platforms/android/local.properties
	www/templates/tab-buys.html
This commit is contained in:
Carsten Hilmer
2016-01-22 00:39:00 +01:00
parent d22c3ce5b1 f003b2ed3c
commit 81c4347cf1
211 changed files with 521 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
platforms/android/build/outputs/apk/manifest-merger-debug-report.txt
View File

@@ -1,32 +1,32 @@
-- Merging decision tree log ---
manifest
ADDED from AndroidManifest.xml:2:1
android:hardwareAccelerated
ADDED from AndroidManifest.xml:2:11
xmlns:android
ADDED from AndroidManifest.xml:2:139
package
ADDED from AndroidManifest.xml:2:98
android:versionName
ADDED from AndroidManifest.xml:2:70
android:hardwareAccelerated
ADDED from AndroidManifest.xml:2:11
android:versionCode
ADDED from AndroidManifest.xml:2:46
INJECTED from AndroidManifest.xml:0:0
INJECTED from AndroidManifest.xml:0:0
xmlns:android
ADDED from AndroidManifest.xml:2:139
supports-screens
ADDED from AndroidManifest.xml:3:5
android:resizeable
ADDED from AndroidManifest.xml:3:106
android:largeScreens
ADDED from AndroidManifest.xml:3:49
android:anyDensity
ADDED from AndroidManifest.xml:3:23
android:smallScreens
ADDED from AndroidManifest.xml:3:132
android:normalScreens
ADDED from AndroidManifest.xml:3:77
android:xlargeScreens
ADDED from AndroidManifest.xml:3:160
android:smallScreens
ADDED from AndroidManifest.xml:3:132
android:resizeable
ADDED from AndroidManifest.xml:3:106
android:anyDensity
ADDED from AndroidManifest.xml:3:23
uses-permission#android.permission.INTERNET
ADDED from AndroidManifest.xml:4:5
android:name
@@ -41,28 +41,28 @@ ADDED from AndroidManifest.xml:6:5
ADDED from AndroidManifest.xml:6:22
application
ADDED from AndroidManifest.xml:7:5
android:supportsRtl
ADDED from AndroidManifest.xml:7:116
android:label
ADDED from AndroidManifest.xml:7:83
android:icon
ADDED from AndroidManifest.xml:7:53
android:supportsRtl
ADDED from AndroidManifest.xml:7:116
android:hardwareAccelerated
ADDED from AndroidManifest.xml:7:18
android:icon
ADDED from AndroidManifest.xml:7:53
activity#com.raataar.wolle_rosen_kaufen.MainActivity
ADDED from AndroidManifest.xml:8:9
android:windowSoftInputMode
ADDED from AndroidManifest.xml:8:248
android:label
ADDED from AndroidManifest.xml:8:97
android:launchMode
ADDED from AndroidManifest.xml:8:135
android:windowSoftInputMode
ADDED from AndroidManifest.xml:8:248
android:configChanges
ADDED from AndroidManifest.xml:8:19
android:theme
ADDED from AndroidManifest.xml:8:194
android:name
ADDED from AndroidManifest.xml:8:166
android:launchMode
ADDED from AndroidManifest.xml:8:135
intent-filter#android.intent.action.MAIN+android.intent.category.LAUNCHER
ADDED from AndroidManifest.xml:9:13
android:label