diff options
author | Markus Doits <markus.doits@googlemail.com> | 2011-11-03 20:14:24 +0100 |
---|---|---|
committer | Markus Doits <markus.doits@googlemail.com> | 2011-11-03 20:14:24 +0100 |
commit | 1b7fbb1eebea32ebce28c5f1fa501edf0f2744fc (patch) | |
tree | e8cc68c908c802dbc84a2f19271337ddd2bbe2b0 /default.properties | |
parent | 0502be76524cee950fb33aa1e687f70caabf4030 (diff) | |
parent | 9fbda63b6f20870f9ce6875a625c4e780d250aa9 (diff) | |
download | open-keychain-1b7fbb1eebea32ebce28c5f1fa501edf0f2744fc.tar.gz open-keychain-1b7fbb1eebea32ebce28c5f1fa501edf0f2744fc.tar.bz2 open-keychain-1b7fbb1eebea32ebce28c5f1fa501edf0f2744fc.zip |
Update to latest version in master
Merge branch 'master' into apg_service
Conflicts:
src/org/thialfihar/android/apg/Apg.java
src/org/thialfihar/android/apg/Preferences.java
Diffstat (limited to 'default.properties')
-rw-r--r-- | default.properties | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/default.properties b/default.properties index 51e933a98..e735ffa56 100644 --- a/default.properties +++ b/default.properties @@ -10,4 +10,4 @@ # Indicates whether an apk should be generated for each density. split.density=false # Project target. -target=android-8 +target=android-13 |