merg complete

2016-01-22 00:53:11 +01:00
parent 81c4347cf1
commit 3c5d7f9b37
193 changed files with 40 additions and 71 deletions
--- a/platforms/android/build/generated/source/aidl/debug/com/android/vending/billing/IInAppBillingService.java
+++ b/platforms/android/build/generated/source/aidl/debug/com/android/vending/billing/IInAppBillingService.java
@@ -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;
 /**
--- a/platforms/android/build/intermediates/classes/debug/com/android/vending/billing/IInAppBillingService$Stub$Proxy.class
+++ b/platforms/android/build/intermediates/classes/debug/com/android/vending/billing/IInAppBillingService$Stub$Proxy.class
--- a/platforms/android/build/intermediates/classes/debug/com/android/vending/billing/IInAppBillingService$Stub.class
+++ b/platforms/android/build/intermediates/classes/debug/com/android/vending/billing/IInAppBillingService$Stub.class
--- a/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/inappbilling/InAppBillingPlugin$1.class
+++ b/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/inappbilling/InAppBillingPlugin$1.class
--- a/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/inappbilling/InAppBillingPlugin.class
+++ b/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/inappbilling/InAppBillingPlugin.class
--- a/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/Action$1.class
+++ b/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/Action$1.class
--- a/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/Action$2.class
+++ b/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/Action$2.class
--- a/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/Action$3.class
+++ b/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/Action$3.class
--- a/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/Action$4.class
+++ b/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/Action$4.class
--- a/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/Action.class
+++ b/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/Action.class
--- a/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/Base64.class
+++ b/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/Base64.class
--- a/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/IabHelper$1.class
+++ b/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/IabHelper$1.class
--- a/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/IabHelper$2$1.class
+++ b/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/IabHelper$2$1.class
--- a/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/IabHelper$2.class
+++ b/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/IabHelper$2.class
--- a/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/IabHelper$3$1.class
+++ b/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/IabHelper$3$1.class
--- a/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/IabHelper$3$2.class
+++ b/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/IabHelper$3$2.class
--- a/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/IabHelper$3.class
+++ b/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/IabHelper$3.class
--- a/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/IabHelper.class
+++ b/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/IabHelper.class
--- a/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/Inventory.class
+++ b/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/Inventory.class
--- a/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/Security.class
+++ b/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/Security.class
--- a/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/SkuDetails.class
+++ b/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/SkuDetails.class
--- a/platforms/android/build/intermediates/classes/debug/io/ionic/keyboard/IonicKeyboard$1.class
+++ b/platforms/android/build/intermediates/classes/debug/io/ionic/keyboard/IonicKeyboard$1.class
--- a/platforms/android/build/intermediates/classes/debug/io/ionic/keyboard/IonicKeyboard$2.class
+++ b/platforms/android/build/intermediates/classes/debug/io/ionic/keyboard/IonicKeyboard$2.class
--- a/platforms/android/build/intermediates/classes/debug/io/ionic/keyboard/IonicKeyboard$3$1.class
+++ b/platforms/android/build/intermediates/classes/debug/io/ionic/keyboard/IonicKeyboard$3$1.class
--- a/platforms/android/build/intermediates/classes/debug/io/ionic/keyboard/IonicKeyboard$3.class
+++ b/platforms/android/build/intermediates/classes/debug/io/ionic/keyboard/IonicKeyboard$3.class
--- a/platforms/android/build/intermediates/classes/debug/io/ionic/keyboard/IonicKeyboard.class
+++ b/platforms/android/build/intermediates/classes/debug/io/ionic/keyboard/IonicKeyboard.class
--- a/platforms/android/build/intermediates/classes/debug/io/liteglue/SQLiteAndroidDatabase$QueryType.class
+++ b/platforms/android/build/intermediates/classes/debug/io/liteglue/SQLiteAndroidDatabase$QueryType.class
--- a/platforms/android/build/intermediates/classes/debug/io/liteglue/SQLiteAndroidDatabase.class
+++ b/platforms/android/build/intermediates/classes/debug/io/liteglue/SQLiteAndroidDatabase.class
--- a/platforms/android/build/intermediates/classes/debug/io/liteglue/SQLitePlugin$1.class
+++ b/platforms/android/build/intermediates/classes/debug/io/liteglue/SQLitePlugin$1.class
--- a/platforms/android/build/intermediates/classes/debug/io/liteglue/SQLitePlugin$Action.class
+++ b/platforms/android/build/intermediates/classes/debug/io/liteglue/SQLitePlugin$Action.class
--- a/platforms/android/build/intermediates/classes/debug/io/liteglue/SQLitePlugin$DBRunner.class
+++ b/platforms/android/build/intermediates/classes/debug/io/liteglue/SQLitePlugin$DBRunner.class
--- a/platforms/android/build/intermediates/classes/debug/io/liteglue/SQLitePlugin$SQLiteDatabaseNDK.class
+++ b/platforms/android/build/intermediates/classes/debug/io/liteglue/SQLitePlugin$SQLiteDatabaseNDK.class
--- a/platforms/android/build/intermediates/classes/debug/io/liteglue/SQLitePlugin.class
+++ b/platforms/android/build/intermediates/classes/debug/io/liteglue/SQLitePlugin.class
--- a/platforms/android/build/intermediates/classes/debug/me/rahul/plugins/sqlDB/sqlDB$1.class
+++ b/platforms/android/build/intermediates/classes/debug/me/rahul/plugins/sqlDB/sqlDB$1.class
--- a/platforms/android/build/intermediates/classes/debug/me/rahul/plugins/sqlDB/sqlDB.class
+++ b/platforms/android/build/intermediates/classes/debug/me/rahul/plugins/sqlDB/sqlDB.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/device/Device.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/device/Device.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/AssetFilesystem.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/AssetFilesystem.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/ContentFilesystem.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/ContentFilesystem.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/DirectoryManager.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/DirectoryManager.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$1.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$1.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$10.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$10.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$11.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$11.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$12.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$12.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$13.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$13.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$14.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$14.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$15.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$15.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$16.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$16.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$17.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$17.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$18.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$18.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$19.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$19.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$2.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$2.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$20.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$20.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$21.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$21.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$22.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$22.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$23.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$23.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$24.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$24.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$25.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$25.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$26.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$26.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$3.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$3.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$4.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$4.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$5.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$5.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$6.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$6.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$7.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$7.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$8.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$8.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$9.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils$9.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/FileUtils.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/Filesystem$LimitedInputStream.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/Filesystem$LimitedInputStream.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/Filesystem.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/Filesystem.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/LocalFilesystem.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/LocalFilesystem.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/LocalFilesystemURL.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/file/LocalFilesystemURL.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/filetransfer/FileTransfer$1.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/filetransfer/FileTransfer$1.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/filetransfer/FileTransfer$2.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/filetransfer/FileTransfer$2.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/filetransfer/FileTransfer$3.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/filetransfer/FileTransfer$3.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/filetransfer/FileTransfer$4.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/filetransfer/FileTransfer$4.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/filetransfer/FileTransfer$5.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/filetransfer/FileTransfer$5.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/filetransfer/FileTransfer.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/filetransfer/FileTransfer.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/filetransfer/FileUploadResult.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/filetransfer/FileUploadResult.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$1.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$1.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$2.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$2.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$3.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$3.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$4$1.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$4$1.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$4.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$4.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$5$1.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$5$1.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$5$2.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$5$2.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$5$3.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$5$3.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$5$4.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$5$4.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$5.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$5.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$InAppBrowserClient.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$InAppBrowserClient.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppChromeClient.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppChromeClient.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/splashscreen/SplashScreen$1.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/splashscreen/SplashScreen$1.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/splashscreen/SplashScreen$2.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/splashscreen/SplashScreen$2.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/splashscreen/SplashScreen$3.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/splashscreen/SplashScreen$3.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/splashscreen/SplashScreen$4.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/splashscreen/SplashScreen$4.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/splashscreen/SplashScreen$5$1.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/splashscreen/SplashScreen$5$1.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/splashscreen/SplashScreen$5.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/splashscreen/SplashScreen$5.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/splashscreen/SplashScreen$6$1.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/splashscreen/SplashScreen$6$1.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/splashscreen/SplashScreen$6.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/splashscreen/SplashScreen$6.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/splashscreen/SplashScreen$7.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/splashscreen/SplashScreen$7.class
--- a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/splashscreen/SplashScreen.class
+++ b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/splashscreen/SplashScreen.class
--- a/Show More
+++ b/Show More