Merge branch 'master' of git.linphone.org:linphone-android
This commit is contained in:
commit
0421185edd
3 changed files with 2 additions and 17 deletions
|
@ -1,15 +0,0 @@
|
|||
# This file is automatically generated by Android Tools.
|
||||
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
|
||||
#
|
||||
# This file must be checked in Version Control Systems.
|
||||
#
|
||||
# To customize properties used by the Ant build system edit
|
||||
# "ant.properties", and override values to adapt the script to your
|
||||
# project structure.
|
||||
#
|
||||
# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
|
||||
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
|
||||
|
||||
# Project target.
|
||||
target=android-18
|
||||
android.library=false
|
|
@ -1 +1 @@
|
|||
Subproject commit e6b7360a56174adf84bbb3e3c8db302e3eb77f03
|
||||
Subproject commit c30a0d81af4e4be06114bbd372467287a97785e1
|
|
@ -1 +1 @@
|
|||
Subproject commit f0250b5a5fb9cb6a2bbf0432f7b4bb352189dafe
|
||||
Subproject commit 87d4f5f895c3f989d250614f0ced324502c900ea
|
Loading…
Reference in a new issue