@@ -29,6 +29,7 @@
*.csproj text eol=crlf
#*.vbproj merge=binary
*.vcxproj text eol=crlf
+*.vcxproj.filters text eol=crlf
*.vcproj text eol=crlf
*.filters text eol=crlf
#*.dbproj merge=binary
@@ -42,10 +43,12 @@
*.cmd text eol=crlf
*.bat text eol=crlf
*.props text eol=crlf
-*.sh text eol=lf
-*.pbxproj text eol=lf
+
+*.sh text eol=lf
+*.pbxproj text eol=lf
*.storyboard text eol=lf
-*.plist text eol=lf
+*.plist text eol=lf
###############################################################################
# behavior for image files
@@ -55,8 +58,8 @@
*.jpg binary
*.png binary
*.gif binary
-*.ttf binary
-*.lib binary
+*.ttf binary
+*.lib binary
# diff behavior for common document formats
@@ -6,6 +6,7 @@
#include "modVer.h"
#include <vector>
+#include <memory>
#define ISSUCCEEDED(hr) ((hr) == Error_Succeed)
#define FAILURED(hr) (!(ISSUCCEEDED(hr)))