From dd2d475887afb469ce3000c8a25b7f5aed44bb09 Mon Sep 17 00:00:00 2001
From: bcnjr5 <bcnjr5@gmail.com>
Date: Wed, 5 Jun 2013 12:56:50 -0300
Subject: [PATCH] Updated .gitattributes

- Alphabetized.
- Probably unnecessary.
---
 .gitattributes | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/.gitattributes b/.gitattributes
index 2e62a4e59..8357a1470 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,16 @@
+# Automatically normalize line endings
+* text=auto
+
+
+# C++ Source Code
 *.cpp diff=cpp
 *.h diff=cpp
+
+# Plain Text files
+*.conf text
+*.example text
+*.txt text
+
+# Textures and Images
+*.ico binary
+*.png binary