Merge remote-tracking branch 'refs/remotes/origin/master_daily' into …

…master_stable
Vdauphin · Mar 5, 2018 · 9f5dfea · 9f5dfea
2 parents 898bbf6 + 18ba6c8
commit 9f5dfea
Show file tree

Hide file tree

Showing 255 changed files with 14,101 additions and 12,361 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,6 @@
+* text=auto
+
+*.png binary
+*.jpg binary
+*.paa binary
+*.7z binary
diff --git a/=BTC=co@30_Hearts_and_Minds.Altis/.editorconfig b/=BTC=co@30_Hearts_and_Minds.Altis/.editorconfig
@@ -0,0 +1,14 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true