Merge branch 'bstable'

2015-03-02 11:08:48 -08:00 · 2015-03-02 11:08:48 -08:00 · 6374542032
commit 6374542032
parent b5180c11a8 ade3989539
1 changed files with 0 additions and 1 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -2,7 +2,6 @@
 * text=auto

 builds/* -text
-text eol=lf

 # Custom for Visual Studio
 *.cs     diff=csharp