florent37 · multicastbr · Jul 7, 2015 · Jul 8, 2015 · Jul 8, 2015 · Jul 8, 2015
diff --git a/.gitignore b/.gitignore
@@ -2,8 +2,6 @@
 *.apk
 *.ap_
 
-.idea/workspace.xml
-
 # Files for the Dalvik VM
 *.dex
 
@@ -17,7 +15,6 @@ gen/
 # Gradle files
 .gradle/
 build/
-/*/build/
 
 # Local configuration file (sdk path, etc)
 local.properties
@@ -27,3 +24,14 @@ proguard/
 
 # Log Files
 *.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+.gradle
+.idea
+*.iml
+**/build/*
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/libraries/android_observablescrollview_1_5_2.xml b/.idea/libraries/android_observablescrollview_1_5_2.xml
diff --git a/.idea/libraries/appcompat_v7_22_2_0.xml b/.idea/libraries/appcompat_v7_22_2_0.xml
diff --git a/.idea/libraries/cardview_v7_22_2_0.xml b/.idea/libraries/cardview_v7_22_2_0.xml
diff --git a/.idea/libraries/kenburnsview_1_0_6.xml b/.idea/libraries/kenburnsview_1_0_6.xml
diff --git a/.idea/libraries/library_1_1_0.xml b/.idea/libraries/library_1_1_0.xml
diff --git a/.idea/libraries/library_2_4_0.xml b/.idea/libraries/library_2_4_0.xml
diff --git a/.idea/libraries/materialviewpager_1_0_6.xml b/.idea/libraries/materialviewpager_1_0_6.xml
diff --git a/.idea/libraries/picasso_2_5_2.xml b/.idea/libraries/picasso_2_5_2.xml
diff --git a/.idea/libraries/recyclerview_v7_22_2_0.xml b/.idea/libraries/recyclerview_v7_22_2_0.xml
diff --git a/.idea/libraries/support_annotations_22_2_0.xml b/.idea/libraries/support_annotations_22_2_0.xml
diff --git a/.idea/libraries/support_v4_22_2_0.xml b/.idea/libraries/support_v4_22_2_0.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.travis.yml b/.travis.yml
diff --git a/MaterialViewPager.iml b/MaterialViewPager.iml
@@ -13,7 +13,7 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>