Normalize end-of-line attributes in repository

freeorion · Feb 27, 2016 · a764120 · a764120
1 parent 3ce6cc0
commit a764120
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,6 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+# Normalize all detected text files to LF line endings when checking in.
+* text=auto
+
+# MS Application manifest
+*.manifest text eol=crlf
diff --git a/exe.manifest b/exe.manifest
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-      <requestedPrivileges>
-        <!-- Make sure that UAC believes that the executable only requires the privileges of the invoker -->
-          <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
-       </requestedPrivileges>
-     </security>
-  </trustInfo>
-</assembly>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <!-- Make sure that UAC believes that the executable only requires the privileges of the invoker -->
+          <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+       </requestedPrivileges>
+     </security>
+  </trustInfo>
+</assembly>