Startsida Utforska Hjälp
Logga in
kxn
/
Android
2
0
Fork 0
Filer Ärenden 0 Pull-förfrågningar 0 Wiki
Träd: 4220f22b0a
Grenar Taggar
Android
/
.svn
/
pristine
/
23
/
239072ae6d0849630aefe29b6aed72fffdcc8921.svn-base

239072ae6d0849630aefe29b6aed72fffdcc8921.svn-base 1.6 KB
Historik Rå

12345678910111213141516171819202122232425 
  1. -- Merging decision tree log ---
    2. 

  2. manifest
    3. 

  3. ADDED from D:\studiowork\evvm\eVVM_Android\base\src\main\AndroidManifest.xml:1:1-36
    4. 

  4. INJECTED from D:\studiowork\evvm\eVVM_Android\base\src\main\AndroidManifest.xml:1:1-36
    5. 

  5. INJECTED from D:\studiowork\evvm\eVVM_Android\base\src\main\AndroidManifest.xml:1:1-36
    6. 

  6. 	package
    7. 

  7. 		ADDED from D:\studiowork\evvm\eVVM_Android\base\src\main\AndroidManifest.xml:1:11-33
    8. 

  8. 		INJECTED from D:\studiowork\evvm\eVVM_Android\base\src\main\AndroidManifest.xml
    9. 

  9. 		INJECTED from D:\studiowork\evvm\eVVM_Android\base\src\main\AndroidManifest.xml
    10. 

  10. 	xmlns:android
    11. 

  11. 		ADDED from D:\studiowork\evvm\eVVM_Android\base\src\main\AndroidManifest.xml:1:1-36
    12. 

  12. uses-sdk
    13. 

  13. INJECTED from D:\studiowork\evvm\eVVM_Android\base\src\main\AndroidManifest.xml reason: use-sdk injection requested
    14. 

  14. INJECTED from D:\studiowork\evvm\eVVM_Android\base\src\main\AndroidManifest.xml
    15. 

  15. INJECTED from D:\studiowork\evvm\eVVM_Android\base\src\main\AndroidManifest.xml
    16. 

  16. INJECTED from D:\studiowork\evvm\eVVM_Android\base\src\main\AndroidManifest.xml
    17. 

  17. INJECTED from D:\studiowork\evvm\eVVM_Android\base\src\main\AndroidManifest.xml
    18. 

  18. 	android:targetSdkVersion
    19. 

  19. 		INJECTED from D:\studiowork\evvm\eVVM_Android\base\src\main\AndroidManifest.xml
    20. 

  20. 		ADDED from D:\studiowork\evvm\eVVM_Android\base\src\main\AndroidManifest.xml
    21. 

  21. 		INJECTED from D:\studiowork\evvm\eVVM_Android\base\src\main\AndroidManifest.xml
    22. 

  22. 	android:minSdkVersion
    23. 

  23. 		INJECTED from D:\studiowork\evvm\eVVM_Android\base\src\main\AndroidManifest.xml
    24. 

  24. 		ADDED from D:\studiowork\evvm\eVVM_Android\base\src\main\AndroidManifest.xml
    25. 

  25. 		INJECTED from D:\studiowork\evvm\eVVM_Android\base\src\main\AndroidManifest.xml
    26.