Merge branch 'refactoring' of github.com:kochka/WeightLogger

kochka · May 22, 2017 · c574c3f · c574c3f
2 parents 0d35574 + 28880d9
commit c574c3f
Show file tree

Hide file tree

Showing 243 changed files with 4,643 additions and 798 deletions.
diff --git a/.classpath b/.classpath
diff --git a/.gitignore b/.gitignore
@@ -8,13 +8,38 @@
 # Java class files
 *.class
 
+# built native files
+*.o
+*.so
+
 # generated files
 bin/
 gen/
-dist/
+
+# Ignore gradle files
+.gradle/
+build/
+/*/build/
 
 # Local configuration file (sdk path, etc)
 local.properties
 
-# Misc
-.directory
+# Proguard folder generated by Eclipse
+proguard/
+
+# Eclipse Metadata
+.metadata/
+
+# Mac OS X clutter
+*.DS_Store
+
+# Windows clutter
+Thumbs.db
+
+# Intellij IDEA (see https://intellij-support.jetbrains.com/entries/23393067)
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/datasources.xml
+.idea/dataSources.ids
+
+.idea
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
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/antpluginlib.xml b/.idea/libraries/antpluginlib.xml
diff --git a/.idea/libraries/appcompat_v7_22_0_0.xml b/.idea/libraries/appcompat_v7_22_0_0.xml
diff --git a/.idea/libraries/fit.xml b/.idea/libraries/fit.xml
diff --git a/.idea/libraries/floatingactionbutton_1_3_0.xml b/.idea/libraries/floatingactionbutton_1_3_0.xml
diff --git a/.idea/libraries/graphview_4_0_1.xml b/.idea/libraries/graphview_4_0_1.xml
diff --git a/.idea/libraries/hmmapiwsble.xml b/.idea/libraries/hmmapiwsble.xml