Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-10040. Merging change r1531983 from trunk to branch-2. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531984 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Chris Nauroth 2013-10-14 17:14:24 +00:00
parent 4e4e958213
commit a5467739bb
2 changed files with 297 additions and 297 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.gitattributes vendored
View File

@ -13,8 +13,8 @@
*.sh text eol=lf
*.bat binary
*.cmd binary
*.vcxproj binary
*.csproj binary
*.sln binary
*.bat text eol=crlf
*.cmd text eol=crlf
*.vcxproj text merge=union eol=crlf
*.csproj text merge=union eol=crlf
*.sln text merge=union eol=crlf