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

6
platforms/android/build/intermediates/res/debug/values/values.xml
View File

@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- From: file:/C:/Ionic/Ionic/git/wolle-rosen-kaufen/platforms/android/res/values/strings.xml -->
<!-- From: file:/C:/Projekte/wolle-rosen-kaufen/platforms/android/res/values/strings.xml -->
<eat-comment/>
<string name="activity_name">@string/launcher_name</string>
<string name="app_name">Wolle Rosen kaufen</string>
<!-- From: file:/C:/Ionic/Ionic/git/wolle-rosen-kaufen/platforms/android/res/values/billing_key_param.xml -->
<!-- From: file:/C:/Projekte/wolle-rosen-kaufen/platforms/android/res/values/billing_key_param.xml -->
<eat-comment/>
<string name="billing_key_param">MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnmmtV3BOmcyoYAGFakzJWpM07n3F2SmaQnjyaZsENaAq6vb7ziam6bS5LqZgMTaXSO2T4QeYoi3UZEIwuQiQ0N6BYCUca3tCa/aT1pbvVOD67cIpM+Z14UFYBnOo1RVvf4KKGZ8zJ6qUm5vsDuIboZ7P4dyXzpxRBSO3R1jDWhVCT8dyAdfQwf1Dp6mPg0sv5Q6UjAO3Jg4sMjOZID6WcAHQFxB1lDgVGmf70WZwWuGh7gQy2SvnuFcDAxT73hGjSH1j1xZB0Wr0T/vvoGpcBwj+Tjt3BbqwY2R3VbbImsuBCrkbFTIojQ8hyqxSrhftCfLyn4h/2mauo8IRVi+RrwIDAQAB</string>
<!-- From: file:/C:/Ionic/Ionic/git/wolle-rosen-kaufen/platforms/android/res/values/strings.xml -->
<!-- From: file:/C:/Projekte/wolle-rosen-kaufen/platforms/android/res/values/strings.xml -->
<eat-comment/>
<string name="launcher_name">@string/app_name</string>
</resources>

2
platforms/android/build/intermediates/res/debug/xml/config.xml
View File

@@ -75,4 +75,4 @@
<preference name="SplashScreen" value="screen" />
<preference name="SplashScreenDelay" value="3000" />
</widget>
<!-- From: file:/C:/Ionic/Ionic/git/wolle-rosen-kaufen/platforms/android/res/xml/config.xml -->
<!-- From: file:/C:/Projekte/wolle-rosen-kaufen/platforms/android/res/xml/config.xml -->

BIN
platforms/android/build/intermediates/res/resources-debug-test.ap_
View File

Binary file not shown.