Neue Hintergründe

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

View File

@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main"><source path="D:\_PROJEKTE_\Android_NAS\sprueche-tv-star\app\src\androidTest\assets"/></dataSet></merger>
<merger version="3"><dataSet config="main"><source path="D:\Projekte\Android\sprueche-tv-star\app\src\androidTest\assets"/></dataSet></merger>

View File

@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="21.0.3"><source path="D:\_PROJEKTE_\Android_NAS\sprueche-tv-star\app\build\intermediates\exploded-aar\com.android.support\support-v4\21.0.3\assets"/></dataSet><dataSet config="1.0.1"><source path="D:\_PROJEKTE_\Android_NAS\sprueche-tv-star\app\build\intermediates\exploded-aar\com.android.support\multidex\1.0.1\assets"/></dataSet><dataSet config="main"><source path="D:\_PROJEKTE_\Android_NAS\sprueche-tv-star\app\src\main\assets"/></dataSet><dataSet config="debug"><source path="D:\_PROJEKTE_\Android_NAS\sprueche-tv-star\app\src\debug\assets"/></dataSet></merger>
<merger version="3"><dataSet config="21.0.3"><source path="D:\Projekte\Android\sprueche-tv-star\app\build\intermediates\exploded-aar\com.android.support\support-v4\21.0.3\assets"/></dataSet><dataSet config="1.0.1"><source path="D:\Projekte\Android\sprueche-tv-star\app\build\intermediates\exploded-aar\com.android.support\multidex\1.0.1\assets"/></dataSet><dataSet config="main"><source path="D:\Projekte\Android\sprueche-tv-star\app\src\main\assets"/></dataSet><dataSet config="debug"><source path="D:\Projekte\Android\sprueche-tv-star\app\src\debug\assets"/></dataSet></merger>

View File

@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="21.0.3"><source path="C:\_PROJEKTE_\Android\Development\weisheiten-sports\app\build\intermediates\exploded-aar\com.android.support\support-v4\21.0.3\assets"/></dataSet><dataSet config="1.0.1"><source path="C:\_PROJEKTE_\Android\Development\weisheiten-sports\app\build\intermediates\exploded-aar\com.android.support\multidex\1.0.1\assets"/></dataSet><dataSet config="main"><source path="C:\_PROJEKTE_\Android\Development\weisheiten-sports\app\src\main\assets"/></dataSet><dataSet config="release"><source path="C:\_PROJEKTE_\Android\Development\weisheiten-sports\app\src\release\assets"/></dataSet></merger>
<merger version="3"><dataSet config="21.0.3"><source path="D:\Projekte\Android\sprueche-tv-star\app\build\intermediates\exploded-aar\com.android.support\support-v4\21.0.3\assets"/></dataSet><dataSet config="1.0.1"><source path="D:\Projekte\Android\sprueche-tv-star\app\build\intermediates\exploded-aar\com.android.support\multidex\1.0.1\assets"/></dataSet><dataSet config="main"><source path="D:\Projekte\Android\sprueche-tv-star\app\src\main\assets"/></dataSet><dataSet config="release"><source path="D:\Projekte\Android\sprueche-tv-star\app\src\release\assets"/></dataSet></merger>

View File

@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main"><source path="D:\_PROJEKTE_\Android_NAS\sprueche-tv-star\app\src\androidTest\res"/><source path="D:\_PROJEKTE_\Android_NAS\sprueche-tv-star\app\build\generated\res\rs\androidTest\debug"/><source path="D:\_PROJEKTE_\Android_NAS\sprueche-tv-star\app\build\generated\res\generated\androidTest\debug"/></dataSet><mergedItems/></merger>
<merger version="3"><dataSet config="main"><source path="D:\Projekte\Android\sprueche-tv-star\app\src\androidTest\res"/><source path="D:\Projekte\Android\sprueche-tv-star\app\build\generated\res\rs\androidTest\debug"/><source path="D:\Projekte\Android\sprueche-tv-star\app\build\generated\res\generated\androidTest\debug"/></dataSet><mergedItems/></merger>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long