diff options
| author | goblin911 <[email protected]> | 2013-08-25 21:16:45 +0800 |
|---|---|---|
| committer | goblin911 <[email protected]> | 2013-08-25 21:16:45 +0800 |
| commit | 2efdc2f20f0306791ced5ec78a1acddfaf086f42 (patch) | |
| tree | a85f2b32d6e6da9d7329ab975fea3bd79e1b94b6 /client/project.properties | |
| parent | e5599da7fdd344fdcb49e8d6780a1e2ad358ee2d (diff) | |
| parent | 263967cbb477983ae8680b431c1d93f102971c30 (diff) | |
Merge branch 'master' of https://github.com/Determinant/piztor
Conflicts:
client/Piztor/bin/classes/com/macaroon/piztor/ActMgr.class
client/Piztor/bin/classes/com/macaroon/piztor/AppMgr.class
client/Piztor/bin/classes/com/macaroon/piztor/R$drawable.class
client/Piztor/bin/classes/com/macaroon/piztor/R$id.class
client/Piztor/bin/classes/com/macaroon/piztor/R$layout.class
client/Piztor/bin/classes/com/macaroon/piztor/R$menu.class
client/Piztor/bin/classes/com/macaroon/piztor/R$string.class
client/Piztor/gen/com/macaroon/piztor/R.java
client/Piztor/res/values/strings.xml
client/bin/classes/com/macaroon/piztor/ActStatus.class
client/bin/classes/com/macaroon/piztor/EmptyStatus.class
client/bin/classes/com/macaroon/piztor/Setting.class
client/src/com/macaroon/piztor/AppMgr.java
client/src/com/macaroon/piztor/Setting.java
Diffstat (limited to 'client/project.properties')
| -rw-r--r-- | client/project.properties | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/client/project.properties b/client/project.properties new file mode 100644 index 0000000..ce39f2d --- /dev/null +++ b/client/project.properties @@ -0,0 +1,14 @@ +# 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 |