Merge branch 'master' into pr/27

Conflicts: .gitignore
gujingjing · Sep 17, 2015 · 9d798f9 · 9d798f9
2 parents e8f9ada + 656eb9c
commit 9d798f9
Showing 1 changed file with 49 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -33,7 +33,55 @@ local.properties
 proguard.cfg
 proguard-project.txt
 
+<<<<<<< HEAD
 # Other
 .DS_Store
 dist
-tmp
+tmp
+=======
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android generated
+bin
+gen
+lint.xml
+
+# IntelliJ IDEA
+.idea
+*.iml
+*.ipr
+*.iws
+classes
+gen-external-apklibs
+
+# Eclipse
+.project
+.classpath
+.settings
+.checkstyle
+
+# Gradle
+.gradle
+build
+out
+
+# Maven
+target
+release.properties
+pom.xml.*
+
+# Ant
+ant.properties
+local.properties
+proguard.cfg
+proguard-project.txt
+
+# Other
+.DS_Store
+dist
+tmp
+>>>>>>> master