Merge branch 'master' into fix-c4996

Conflicts: extensions/clipboard/ace_clipboard.cpp
acemod · Jun 12, 2016 · b52c1c8 · b52c1c8
2 parents 8dc8926 + 1136a57
commit b52c1c8
Show file tree

Hide file tree

Showing 598 changed files with 82,065 additions and 80,221 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -1,7 +1,7 @@
 root = true
 
 [*]
-end_of_line = crlf
+end_of_line = lf
 insert_final_newline = true
 charset = utf-8
 indent_style = space

diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,4 @@
+* text=auto
+*.png binary
+*.jpg binary
+*.paa binary
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,9 @@
-release/*
-tools/temp
-*.cache
-*.pbo
-texHeaders.bin
-*.swp
-*.swo
-*.biprivatekey
-Thumbs.db
+release/*
+tools/temp
+*.cache
+*.pbo
+texHeaders.bin
+*.swp
+*.swo
+*.biprivatekey
+Thumbs.db
diff --git a/addons/aircraft/Heli_Attack_01_base_F.hpp b/addons/aircraft/Heli_Attack_01_base_F.hpp