Merge remote-tracking branch 'upstream/master'

Reverted .gitattributes xcode_ccache_wrapper change. Fixed line endings
for .gitignore and .gitattributes.

.gitignore

@@ -1,67 +1,67 @@
-# Files to ignore when considering what GIT should commit.
-
-# Visual Studio 
-*.suo
-*.user
-*.sln.docstates
-*.obj
-*.pch
-*.tlog
-*.log
-*.scc
-*.exp
-*.ilk
-*.lastbuildstate
-vc100.pdb
-ipch
-*.sdf
-*.opensdf
-*.idb
-*.vcxproj
-*.vcxproj.filters
-*.sln
-[Dd]ebug*/
-[Rr]elease*/
-
-# OSX/Linux build products
+# Files to ignore when considering what GIT should commit.
+
+# Visual Studio 
+*.suo
+*.user
+*.sln.docstates
+*.obj
+*.pch
+*.tlog
+*.log
+*.scc
+*.exp
+*.ilk
+*.lastbuildstate
+vc100.pdb
+ipch
+*.sdf
+*.opensdf
+*.idb
+*.vcxproj
+*.vcxproj.filters
+*.sln
+[Dd]ebug*/
+[Rr]elease*/
+
+# OSX/Linux build products
 *.DS_Store
-*.mak
-*.mak.vpc_crc
-*.xcodeproj/
-obj*/
-!devtools/*.mak
-!utils/smdlexp/smdlexp.mak
+*.mak
+*.mak.vpc_crc
+*.xcodeproj/
+obj*/
+!devtools/*.mak
+!utils/smdlexp/smdlexp.mak
 *_osx32*
-
-# Specific Source build products
-client.pdb
-client.dll
-client.lib
-server.pdb
-server.dll
-server.lib
-
-client.so
-client.so.dbg
-server.so
-server.so.dbg
-server_srv.so
-server_srv.so.dbg
-
-client.dylib
-client.dylib.dSYM/
-server.dylib
-server.dylib.dSYM/
-
+
+# Specific Source build products
+client.pdb
+client.dll
+client.lib
+server.pdb
+server.dll
+server.lib
+
+client.so
+client.so.dbg
+server.so
+server.so.dbg
+server_srv.so
+server_srv.so.dbg
+
+client.dylib
+client.dylib.dSYM/
+server.dylib
+server.dylib.dSYM/
+
 *.vpc.sentinel
 *.vpc_crc
 **/generated_proto/**
-**/src/utils/sapi51/**
-**/game/**/bin/**
-
-# files generated by running a mod
-config.cfg
-
-# shader files
-*.tmp
-
+**/src/utils/sapi51/**
+**/game/**/bin/**
+
+# files generated by running a mod
+config.cfg
+
+# shader files
+*.tmp
+