Added line ending normalization.

I started working also in Windows so I added line endings normalization in Git.
applait · Dec 18, 2012 · 24deb2c · 24deb2c
1 parent 8049e98
commit 24deb2c
Show file tree

Hide file tree

Showing 6 changed files with 199 additions and 177 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,22 @@
+# 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
diff --git a/erizo_controller/erizoClient/dist/assets/logo.svg b/erizo_controller/erizoClient/dist/assets/logo.svg
diff --git a/erizo_controller/erizoClient/dist/assets/star.svg b/erizo_controller/erizoClient/dist/assets/star.svg
diff --git a/erizo_controller/test/public/images/cam-01.svg b/erizo_controller/test/public/images/cam-01.svg