Skip to content

Commit

Permalink
Introduce end-of-line normalization
Browse files Browse the repository at this point in the history
  • Loading branch information
kevingranade committed Jun 28, 2014
1 parent f2c8ecd commit 1089f80
Show file tree
Hide file tree
Showing 3 changed files with 2,284 additions and 2,249 deletions.
35 changes: 35 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# These files are text and should be normalized (convert crlf => lf)
*.c text
*.cbp text
*.cpp text
*.h text
*.json text
*.lua text
*.md text
*.py text
*.rc text
*.sh text
*.txt text
*.yml text

# Visual Studio project files, leave them alone.
*.cmd -text
*.filters -text
*.sln -text
*.user -text
*.vcxproj -text

# Generated translation text, don't mess with them.
*.mo -text
*.po -text
*.pot -text

# Treat images, archives, and font files as binary.
# (binary is a macro for -text -diff)
*.db binary
*.fon binary
*.gz binary
*.ico binary
*.png binary
*.ttf binary

18 changes: 9 additions & 9 deletions gfx/TsuTileset/tileset.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#TSU'S TILESET
#Name of the tileset
NAME: tsu
#Viewing (Option) name of the tileset
VIEW: Tsu's
#JSON Path - Default of gfx/tile_config.json
JSON: TsuTileset/tile_config.json
#Tileset Path - Default of gfx/tinytile.png
TILESET: TsuTileset/tsutiles.png
#TSU'S TILESET
#Name of the tileset
NAME: tsu
#Viewing (Option) name of the tileset
VIEW: Tsu's
#JSON Path - Default of gfx/tile_config.json
JSON: TsuTileset/tile_config.json
#Tileset Path - Default of gfx/tinytile.png
TILESET: TsuTileset/tsutiles.png
Loading

0 comments on commit 1089f80

Please sign in to comment.