diff options
| author | Tristan Zur <tristan.zur@ccwn.org> | 2015-01-11 02:39:39 +0100 |
|---|---|---|
| committer | Tristan Zur <tristan.zur@ccwn.org> | 2015-01-11 02:39:39 +0100 |
| commit | e8ca2a1ae3259c66991f69d62c470ca611ee4659 (patch) | |
| tree | ec743af03426e3beda883a015076c55cf1ff7117 /src/main/project.properties | |
| parent | 5a860416b502833b445f10cea004735910ef0986 (diff) | |
| parent | 71bb1e90b0656fe5caa32b34cb5798855d6cc425 (diff) | |
Merge branch 'master' of ssh://git.fucktheforce.de/conversations
Conflicts:
src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
Diffstat (limited to 'src/main/project.properties')
| -rw-r--r-- | src/main/project.properties | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/main/project.properties b/src/main/project.properties new file mode 100644 index 00000000..4ab12569 --- /dev/null +++ b/src/main/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-19 |