diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2014-09-09 20:12:53 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2014-09-09 20:12:53 +0200 |
| commit | 184b08a49f5b2db6c77ba0a96991b3384ccf9d86 (patch) | |
| tree | 5d81a5456ec64ca62c1ff3d872332d2c3b350dd9 /android-support-v7-appcompat | |
| parent | 8acc1aab8c7cfcb81e7275b3cc995d3d51bf2401 (diff) | |
| parent | 89b5653b322534449d64006c4861bc85be086cd5 (diff) | |
| download | cgeo-184b08a49f5b2db6c77ba0a96991b3384ccf9d86.zip cgeo-184b08a49f5b2db6c77ba0a96991b3384ccf9d86.tar.gz cgeo-184b08a49f5b2db6c77ba0a96991b3384ccf9d86.tar.bz2 | |
Merge branch 'release' into upstream
Diffstat (limited to 'android-support-v7-appcompat')
| -rw-r--r-- | android-support-v7-appcompat/android-support-v7-appcompat.iml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/android-support-v7-appcompat/android-support-v7-appcompat.iml b/android-support-v7-appcompat/android-support-v7-appcompat.iml index ca339e4..35b1b99 100644 --- a/android-support-v7-appcompat/android-support-v7-appcompat.iml +++ b/android-support-v7-appcompat/android-support-v7-appcompat.iml @@ -25,7 +25,7 @@ <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" /> </content> - <orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" /> + <orderEntry type="inheritedJdk" /> <orderEntry type="module-library" exported=""> <library name="android-support-v4.jar"> <CLASSES> |