julian/EndlessRoll
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Levels Polished

Browse Source 
Tutorial till level 5 done, but without images (TODO)
Error with ToolSlotSettings fixed
This commit is contained in:
=
2017-04-11 16:52:47 +02:00
parent 27a41a44d7
commit 66e381ad01
561 changed files with 7184 additions and 12452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,8 +21,8 @@ ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\Androi
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\.android\build-cache\60f48fa6620e5d69025f8b11305394fce26a2438\output\AndroidManifest.xml:22:5-20
MERGED from [com.android.support:support-v4:23.1.1] C:\Users\Julian\.android\build-cache\21047d61fecea63fafd2916b945991ed48f60a7d\output\AndroidManifest.xml:22:5-20
MERGED from [com.android.support:appcompat-v7:23.1.1] C:\Users\Julian\.android\build-cache\2232000db64551c7682d41127fbc27c912efcc3d\output\AndroidManifest.xml:22:5-20
MERGED from [com.android.support:support-v4:23.1.1] C:\Users\Julian\.android\build-cache\7988038707870a182a4d2c219c6a86a58ec3478f\output\AndroidManifest.xml:22:5-20
android:label
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:12:9-41
android:supportsRtl
@ -51,8 +51,8 @@ ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\Androi
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
MERGED from [com.android.support:appcompat-v7:23.1.1] C:\Users\Julian\.android\build-cache\60f48fa6620e5d69025f8b11305394fce26a2438\output\AndroidManifest.xml:20:5-43
MERGED from [com.android.support:support-v4:23.1.1] C:\Users\Julian\.android\build-cache\21047d61fecea63fafd2916b945991ed48f60a7d\output\AndroidManifest.xml:20:5-43
MERGED from [com.android.support:appcompat-v7:23.1.1] C:\Users\Julian\.android\build-cache\2232000db64551c7682d41127fbc27c912efcc3d\output\AndroidManifest.xml:20:5-43
MERGED from [com.android.support:support-v4:23.1.1] C:\Users\Julian\.android\build-cache\7988038707870a182a4d2c219c6a86a58ec3478f\output\AndroidManifest.xml:20:5-43
android:targetSdkVersion
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml