https://github.com/PressForward/pressforward
Tip revision: 8c4fa52e6a482e7952eff792cdaebf6649f54bb7 authored by Aram Zucker-Scharff on 14 May 2013, 22:13:08 UTC
Merge branch '1.9.x'
Merge branch '1.9.x'
Tip revision: 8c4fa52
.gitattributes
# Auto detect text files and perform LF normalization
* text=auto
# Custom for Visual Studio
*.cs diff=csharp
*.sln merge=union
*.csproj merge=union
*.vbproj merge=union
*.fsproj merge=union
*.dbproj merge=union
# Standard to msysgit
*.doc diff=astextplain
*.DOC diff=astextplain
*.docx diff=astextplain
*.DOCX diff=astextplain
*.dot diff=astextplain
*.DOT diff=astextplain
*.pdf diff=astextplain
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain