Merge dev

minoue · Sep 12, 2018 · 90776ee · 90776ee
2 parents 9f0d007 + 8cac1e5
commit 90776ee
Show file tree

Hide file tree

Showing 11 changed files with 1,941 additions and 365 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,5 @@
 .DS_Store
 *.un~
 .dropbox.attr*
+*.sublime-project
+*.sublime-workspace
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "module"]
+	path = module
+	url = https://github.com/minoue/rush_module