merg complete

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

View File

@@ -1,3 +1,3 @@
C:\Projekte\wolle-rosen-kaufen\platforms\android\build\intermediates\classes\debug
C:\Projekte\wolle-rosen-kaufen\platforms\android\build\intermediates\pre-dexed\debug\sqlite-connector-b48a0e9f1e964faccb8fb316e4305f62d7cbc418.jar
C:\Projekte\wolle-rosen-kaufen\platforms\android\build\intermediates\pre-dexed\debug\classes-f4825e75318212bc1e800fab97b6eee2442dbc00.jar
C:\Ionic\Ionic\git2\wolle-rosen-kaufen\platforms\android\build\intermediates\classes\debug
C:\Ionic\Ionic\git2\wolle-rosen-kaufen\platforms\android\build\intermediates\pre-dexed\debug\sqlite-connector-c5bcf9094aac2eeac3f20c18fd95650a310d044e.jar
C:\Ionic\Ionic\git2\wolle-rosen-kaufen\platforms\android\build\intermediates\pre-dexed\debug\classes-4edaac19c083b5e3cb973bcf350ccc36c4dc9f27.jar