Merge pull request #1 from blobcity/develop

Merge in current state to master for soft release
blobcity · Sep 12, 2016 · fdc02bf · fdc02bf
2 parents cf63365 + d0b3af7
commit fdc02bf
Show file tree

Hide file tree

Showing 243 changed files with 24,688 additions and 784 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,2 @@
 target
 out
-.idea
-target
-.iml
-*.iml
-.idea
-*/workspace.xml
diff --git a/.idea/libraries/com_google_code_gson_gson_2_7.xml b/.idea/libraries/com_google_code_gson_gson_2_7.xml
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml