diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2014-08-24 23:00:14 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2014-08-24 23:00:14 +0200 |
| commit | 1d1ba504ef07b31e41f32863faa717ddd12856d1 (patch) | |
| tree | bfbbf96ace592ea681d435551b7b203c4a2f289c /main/project.properties | |
| parent | f9f767b5be3f7b6d355f1ab0c17ebabfe32800d2 (diff) | |
| parent | 4d2a5ec1a9b9d9eedc092153ef64d8c204edc527 (diff) | |
| download | cgeo-1d1ba504ef07b31e41f32863faa717ddd12856d1.zip cgeo-1d1ba504ef07b31e41f32863faa717ddd12856d1.tar.gz cgeo-1d1ba504ef07b31e41f32863faa717ddd12856d1.tar.bz2 | |
Merge branch 'release' into upstream
Conflicts:
main/project.properties
main/res/values/strings.xml
main/src/cgeo/geocaching/LogCacheActivity.java
Diffstat (limited to 'main/project.properties')
| -rw-r--r-- | main/project.properties | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/main/project.properties b/main/project.properties index 5530267..4a461c9 100644 --- a/main/project.properties +++ b/main/project.properties @@ -15,5 +15,6 @@ target=Google Inc.:Google APIs:19 android.library.reference.1=../mapswithme-api android.library.reference.2=../android-support-v7-appcompat android.library.reference.3=../google-play-services_lib +android.library.reference.4=../showcaseview java.source=1.7 java.target=1.7 |