Raataar/Wolle-Rosen-Kaufen
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gekaufte Rosen Layout an Hintergrundfarben angepasst

Browse Source
This commit is contained in:
Akki
2016-01-28 21:39:30 +01:00
parent 3c5d7f9b37
commit c237c8c1e5
199 changed files with 78 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
platforms/android/local.properties
View File

@@ -7,14 +7,8 @@
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
<<<<<<< HEAD
#Fri Jan 22 00:12:54 CET 2016
=======
<<<<<<< HEAD
#Thu Jan 21 20:57:23 CET 2016
#Thu Jan 28 20:45:10 CET 2016
>>>>>>>=3333e9eb4a430bda0cc488281fef2864949ca135
sdk.dir=C\:\\Android
=======
#Thu Jan 21 22:00:45 CET 2016
>>>>>>> f003b2ed3c45bc52fbfd8b3ed0e00426040727c0
sdk.dir=C\:\\Program Files (x86)\\Android\\android-sdk
>>>>>>> 3333e9eb4a430bda0cc488281fef2864949ca135
=\=\=\=\=\=\=
<<<<<<<=HEAD