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

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

platforms/android/build/intermediates/pre-dexed/debug/classes-a0342bad41111596f8436cda33b5a5ee045fab74.jar

Binary file not shown.

BIN

platforms/android/build/intermediates/pre-dexed/debug/classes-f4825e75318212bc1e800fab97b6eee2442dbc00.jar Normal file

Binary file not shown.

BIN

platforms/android/build/intermediates/pre-dexed/debug/sqlite-connector-b48a0e9f1e964faccb8fb316e4305f62d7cbc418.jar Normal file

Binary file not shown.

BIN

platforms/android/build/intermediates/pre-dexed/release/classes-32825c42b60850ec580f036ed6c1b20137d6f094.jar

Binary file not shown.