Merge pull request #1 from ppamorim/idea

idea removed
FolioReader · Jan 15, 2016 · 3f54c7b · 3f54c7b
2 parents a1c40c5 + 38d601d
commit 3f54c7b
Show file tree

Hide file tree

Showing 18 changed files with 48 additions and 3,354 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,27 +1,40 @@
-# Built application files
-*.apk
-*.ap_
+# Custom
+_site
 
-# Files for the Dalvik VM
-*.dex
+# Ant
+MANIFEST.MF
+./*.jar
+build.num
+build
 
-# Java class files
-*.class
+# ADT
+.classpath
+.project
+.settings
+local.properties
+bin
+gen
+_layouts
+proguard.cfg
 
-# Generated files
-bin/
-gen/
+# OSX
+.DS_Store
 
-# Gradle files
-.gradle/
-build/
-/*/build/
+# Github
+gh-pages
 
-# Local configuration file (sdk path, etc)
-local.properties
+# Gradle
+.gradle
+build
 
-# Proguard folder generated by Eclipse
-proguard/
+# IDEA
+*.iml
+*.ipr
+*.iws
+out
+.idea
 
-# Log Files
-*.log
+# Maven
+target
+release.properties
+pom.xml.*
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.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/appcompat_v7_22_1_0.xml b/.idea/libraries/appcompat_v7_22_1_0.xml
diff --git a/.idea/libraries/epublib_core_latest.xml b/.idea/libraries/epublib_core_latest.xml
diff --git a/.idea/libraries/slf4j_android_1_5_8.xml b/.idea/libraries/slf4j_android_1_5_8.xml
diff --git a/.idea/libraries/support_annotations_22_1_0.xml b/.idea/libraries/support_annotations_22_1_0.xml
diff --git a/.idea/libraries/support_v4_22_1_0.xml b/.idea/libraries/support_v4_22_1_0.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml