merg complete

This commit is contained in:
Carsten Hilmer 2016-01-22 00:53:11 +01:00
parent 81c4347cf1
commit 3c5d7f9b37
193 changed files with 40 additions and 71 deletions

View File

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main"><source path="C:\Projekte\wolle-rosen-kaufen\platforms\android\CordovaLib\assets"/></dataSet><dataSet config="debug"><source path="C:\Projekte\wolle-rosen-kaufen\platforms\android\CordovaLib\src\debug\assets"/></dataSet></merger>
<merger version="3"><dataSet config="main"><source path="C:\Ionic\Ionic\git2\wolle-rosen-kaufen\platforms\android\CordovaLib\assets"/></dataSet><dataSet config="debug"><source path="C:\Ionic\Ionic\git2\wolle-rosen-kaufen\platforms\android\CordovaLib\src\debug\assets"/></dataSet></merger>

View File

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main"><source path="C:\Projekte\wolle-rosen-kaufen\platforms\android\CordovaLib\res"/><source path="C:\Projekte\wolle-rosen-kaufen\platforms\android\CordovaLib\build\generated\res\rs\debug"/><source path="C:\Projekte\wolle-rosen-kaufen\platforms\android\CordovaLib\build\generated\res\generated\debug"/></dataSet><dataSet config="debug"><source path="C:\Projekte\wolle-rosen-kaufen\platforms\android\CordovaLib\src\debug\res"/></dataSet><mergedItems/></merger>
<merger version="3"><dataSet config="main"><source path="C:\Ionic\Ionic\git2\wolle-rosen-kaufen\platforms\android\CordovaLib\res"/><source path="C:\Ionic\Ionic\git2\wolle-rosen-kaufen\platforms\android\CordovaLib\build\generated\res\rs\debug"/><source path="C:\Ionic\Ionic\git2\wolle-rosen-kaufen\platforms\android\CordovaLib\build\generated\res\generated\debug"/></dataSet><dataSet config="debug"><source path="C:\Ionic\Ionic\git2\wolle-rosen-kaufen\platforms\android\CordovaLib\src\debug\res"/></dataSet><mergedItems/></merger>

View File

@ -1,6 +1,6 @@
/*
* This file is auto-generated. DO NOT MODIFY.
* Original file: C:\\Projekte\\wolle-rosen-kaufen\\platforms\\android\\src\\com\\android\\vending\\billing\\IInAppBillingService.aidl
* Original file: C:\\Ionic\\Ionic\\git2\\wolle-rosen-kaufen\\platforms\\android\\src\\com\\android\\vending\\billing\\IInAppBillingService.aidl
*/
package com.android.vending.billing;
/**

Some files were not shown because too many files have changed in this diff Show More