|
|
@ -1,22 +1,3 @@
|
|
1
|
|
<<<<<<< HEAD
|
|
2
|
|
# This file is automatically generated by Android Tools.
|
|
3
|
|
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
|
|
4
|
|
#
|
|
5
|
|
# This file must be checked in Version Control Systems.
|
|
6
|
|
#
|
|
7
|
|
# To customize properties used by the Ant build system edit
|
|
8
|
|
# "ant.properties", and override values to adapt the script to your
|
|
9
|
|
# project structure.
|
|
10
|
|
#
|
|
11
|
|
# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
|
|
12
|
|
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
|
|
13
|
|
|
|
14
|
|
android.library.reference.1=../wade-mobile-lib
|
|
15
|
|
android.library.reference.2=../wade-mobile-common
|
|
16
|
|
proguard.config=proguard-project.txt
|
|
17
|
|
# Project target.
|
|
18
|
|
target=android-15
|
|
19
|
|
=======
|
|
20
|
1
|
# This file is automatically generated by Android Tools.
|
|
21
|
2
|
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
|
|
22
|
3
|
#
|
|
|
@ -29,9 +10,8 @@ target=android-15
|
|
29
|
10
|
# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
|
|
30
|
11
|
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
|
|
31
|
12
|
|
|
32
|
|
android.library.reference.1=../wade-mobile-lib
|
|
33
|
|
android.library.reference.2=../wade-mobile-common
|
|
34
|
|
proguard.config=proguard-project.txt
|
|
35
|
13
|
# Project target.
|
|
36
|
14
|
target=android-15
|
|
37
|
|
>>>>>>> branch 'master' of http://114.215.100.48:3000/ipu/android-share.git
|
|
|
15
|
android.library=false
|
|
|
16
|
android.library.reference.1=../wade-mobile-common
|
|
|
17
|
android.library.reference.2=../wade-mobile-lib
|
huangbo