Merge with remote.

Norbara · Jan 21, 2017 · 49c9292 · 49c9292
2 parents c8b9d21 + e76160d
commit 49c9292
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 0 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/.gitignore b/app/.gitignore
@@ -1,3 +1,5 @@
+*.imi
+
 /build
 /gradle.properties
 *.apk

diff --git a/app/app.iml b/app/app.iml
@@ -84,8 +84,11 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
+<<<<<<< HEAD
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
+=======
+>>>>>>> e76160d1327c48fc8a2aa7c1894ffa81c7c883cf
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/25.1.0/jars" />

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -17,3 +17,4 @@
 #}
 -dontwarn com.tencent.bugly.**
 -keep public class com.tencent.bugly.**{*;}
+-keep class android.support.**{*;}
-Original file line number
+Diff line change
@@ -1,3 +1,5 @@
+    *.imi
     /build
     /gradle.properties
     *.apk
@@ Expand Down @@