use text=auto

2 files changed, 32 insertions, 19 deletions

diff --git a/.gitattributes b/.gitattributes
index 89aed297..334ba69d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,17 @@
+* text=auto eol=lf
+
 *.[ch]pp text eol=lf
 *.[ch] text eol=lf
 *.inl text eol=lf
 *.rc text eol=lf
+*.json text eol=lf
+*.sh text eol=lf
+*.cmake text eol=lf
+*.conf text eol=lf
+.git?* text eol=lf
+
+*.tga -text
+*.png -text
+*.webp -text
+*.blend -text
+*.blend[0-9] -text
diff --git a/doc/atlas.json.example b/doc/atlas.json.example
index 2c9f0f0a..4a6a910c 100644
--- a/doc/atlas.json.example
+++ b/doc/atlas.json.example
@@ -1,19 +1,19 @@
-{

-    "object_name": "test",

-    "anim_name": "walk",

-    "width": 0, "height": 0,

-    "nframes": 0, "fps": 24,

-    "actionframe": 0,

-

-    "groups": [

-        { "frames": [], "ground": "0 x 0", "name": "n"  },

-        { "frames": [], "ground": "0 x 0", "name": "ne" },

-        { "frames": [], "ground": "0 x 0", "name": "e"  },

-        { "frames": [], "ground": "0 x 0", "name": "se" },

-        { "frames": [], "ground": "0 x 0", "name": "s"  },

-        { "frames": [], "ground": "0 x 0", "name": "sw" },

-        { "frames": [], "ground": "0 x 0", "name": "w"  },

-        { "frames": [], "ground": "0 x 0", "name": "nw" }

-    ]

-}

-// vim: ft=javascript

+{
+    "object_name": "test",
+    "anim_name": "walk",
+    "width": 0, "height": 0,
+    "nframes": 0, "fps": 24,
+    "actionframe": 0,
+
+    "groups": [
+        { "frames": [], "ground": "0 x 0", "name": "n"  },
+        { "frames": [], "ground": "0 x 0", "name": "ne" },
+        { "frames": [], "ground": "0 x 0", "name": "e"  },
+        { "frames": [], "ground": "0 x 0", "name": "se" },
+        { "frames": [], "ground": "0 x 0", "name": "s"  },
+        { "frames": [], "ground": "0 x 0", "name": "sw" },
+        { "frames": [], "ground": "0 x 0", "name": "w"  },
+        { "frames": [], "ground": "0 x 0", "name": "nw" }
+    ]
+}
+// vim: ft=javascript