https://github.com/PressForward/pressforward
Raw File
Tip revision: f1dc9e4d771e3725c4ebaedee0ae7f751e40e2ac authored by Aram Zucker-Scharff on 14 June 2013, 21:42:24 UTC
Merge branch 'master' into 1.9.x
Tip revision: f1dc9e4
.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
back to top