Author: cnauroth
Date: Thu Aug 8 23:55:56 2013
New Revision: 1512105
URL: http://svn.apache.org/r1512105
Log:
HADOOP-9831. Merging change r1512101 from trunk to branch-2.
Modified:
hadoop/common/branches/branch-2/.gitattributes
Modified: hadoop/common/branches/branch-2/.gitattributes
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/.gitattributes?rev=1512105&r1=1512104&r2=1512105&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/.gitattributes (original)
+++ hadoop/common/branches/branch-2/.gitattributes Thu Aug 8 23:55:56 2013
@@ -14,5 +14,6 @@
*.sh text eol=lf
*.bat text eol=crlf
+*.cmd text eol=crlf
*.csproj text merge=union eol=crlf
*.sln text merge=union eol=crlf
