yenru0/EhViewer
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev-AS' into dev-AS

Browse Source
This commit is contained in:
seven332 committed 2015-04-26 02:12:42 +08:00
2 parents 101b1cf256 38bd1e1f37
commit 5bfc033d2d
2 files changed
+5 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/app.iml
+3 -3
View File
@@ -85,10 +85,10 @@
</content>
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="support-v4-22.0.0" level="project" />
<orderEntry type="library" exported="" name="svg-android-2.0.6" level="project" />
<orderEntry type="library" exported="" name="support-annotations-22.0.0" level="project" />
<orderEntry type="library" exported="" name="libGoogleAnalyticsServices" level="project" />
<orderEntry type="library" exported="" name="recyclerview-v7-22.0.0" level="project" />
<orderEntry type="library" exported="" name="support-v4-22.1.0" level="project" />
<orderEntry type="library" exported="" name="support-annotations-22.1.0" level="project" />
<orderEntry type="library" exported="" name="recyclerview-v7-22.1.0" level="project" />
</component>
</module>
app/build.gradle
+2 -2
View File
@@ -59,7 +59,7 @@ clean {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:support-v4:22.0.0'
compile 'com.android.support:recyclerview-v7:22.0.0'
compile 'com.android.support:support-v4:22.1.0'
compile 'com.android.support:recyclerview-v7:22.1.0'
compile 'com.github.japgolly.android:svg-android:2.0.6'
}