julian/EndlessRoll
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
EndlessRoll/app/build/outputs/logs/manifest-merger-debug-report.txt
= 66b3b1d55e Fixed Obstacle-Move-Component bug, when offsets were set 
Countdown now played as three seperate sounds, though not perfect yet (neither timing, nor high pitches)
Added lv 12
2018-04-30 19:04:01 +02:00

84 lines
7.1 KiB
Plaintext
Raw Blame History

-- Merging decision tree log ---
manifest
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:2:1-28:12
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:2:1-28:12
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:2:1-28:12
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:2:1-28:12
MERGED from [com.android.support:appcompat-v7:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\appcompat-v7-23.1.1.aar\d874715e6054e786cbcfdf9c2b37e7ce\AndroidManifest.xml:17:1-24:12
MERGED from [com.android.support:support-v4:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-v4-23.1.1.aar\73b2b88e0673fce2821db6e163719bff\AndroidManifest.xml:17:1-24:12
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:2:1-28:12
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:2:1-28:12
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:2:1-28:12
package
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:3:5-36
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml
android:versionName
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:2:1-28:12
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml
android:versionCode
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:2:1-28:12
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml
xmlns:android
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:2:11-69
uses-feature#0x00020000
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:5:5-7:35
android:glEsVersion
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:6:9-41
android:required
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:7:9-32
application
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:9:5-26:19
MERGED from [com.android.support:appcompat-v7:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\appcompat-v7-23.1.1.aar\d874715e6054e786cbcfdf9c2b37e7ce\AndroidManifest.xml:22:5-20
MERGED from [com.android.support:appcompat-v7:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\appcompat-v7-23.1.1.aar\d874715e6054e786cbcfdf9c2b37e7ce\AndroidManifest.xml:22:5-20
MERGED from [com.android.support:support-v4:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-v4-23.1.1.aar\73b2b88e0673fce2821db6e163719bff\AndroidManifest.xml:22:5-20
MERGED from [com.android.support:support-v4:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-v4-23.1.1.aar\73b2b88e0673fce2821db6e163719bff\AndroidManifest.xml:22:5-20
android:supportsRtl
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:13:9-35
android:label
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:12:9-41
android:icon
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:11:9-43
android:allowBackup
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:10:9-35
android:theme
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:14:9-40
activity#de.frajul.endlessroll.main.GameActivity
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:16:9-25:20
android:screenOrientation
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:19:13-50
android:configChanges
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:18:13-74
android:name
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:17:13-46
intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:20:13-24:29
action#android.intent.action.MAIN
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:21:17-69
android:name
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:21:25-66
category#android.intent.category.LAUNCHER
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:23:17-77
android:name
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:23:27-74
uses-sdk
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml reason: use-sdk injection requested
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml
MERGED from [com.android.support:appcompat-v7:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\appcompat-v7-23.1.1.aar\d874715e6054e786cbcfdf9c2b37e7ce\AndroidManifest.xml:20:5-43
MERGED from [com.android.support:appcompat-v7:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\appcompat-v7-23.1.1.aar\d874715e6054e786cbcfdf9c2b37e7ce\AndroidManifest.xml:20:5-43
MERGED from [com.android.support:support-v4:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-v4-23.1.1.aar\73b2b88e0673fce2821db6e163719bff\AndroidManifest.xml:20:5-43
MERGED from [com.android.support:support-v4:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-v4-23.1.1.aar\73b2b88e0673fce2821db6e163719bff\AndroidManifest.xml:20:5-43
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml
android:targetSdkVersion
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml
android:minSdkVersion
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml
Reference in New Issue View Git Blame Copy Permalink