Merge remote-tracking branch 'upstream/master'

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

48 files changed, 2 insertions, 2 deletions

diff --git a/sp/src/lib/public/appframework.lib b/sp/src/lib/public/appframework.lib
index 1896be3f..2884a22e 100644
--- a/sp/src/lib/public/appframework.lib
+++ b/sp/src/lib/public/appframework.lib
diff --git a/sp/src/lib/public/bitmap.lib b/sp/src/lib/public/bitmap.lib
index 3f631b59..3f842c0b 100644
--- a/sp/src/lib/public/bitmap.lib
+++ b/sp/src/lib/public/bitmap.lib
diff --git a/sp/src/lib/public/choreoobjects.lib b/sp/src/lib/public/choreoobjects.lib
index d9346c6b..b295be49 100644
--- a/sp/src/lib/public/choreoobjects.lib
+++ b/sp/src/lib/public/choreoobjects.lib
diff --git a/sp/src/lib/public/dmxloader.lib b/sp/src/lib/public/dmxloader.lib
index 1bf632e0..ffe58400 100644
--- a/sp/src/lib/public/dmxloader.lib
+++ b/sp/src/lib/public/dmxloader.lib
diff --git a/sp/src/lib/public/fgdlib.lib b/sp/src/lib/public/fgdlib.lib
index b2098d16..c8f92974 100644
--- a/sp/src/lib/public/fgdlib.lib
+++ b/sp/src/lib/public/fgdlib.lib
diff --git a/sp/src/lib/public/libz.lib b/sp/src/lib/public/libz.lib
index 692f43dd..4920f823 100644
--- a/sp/src/lib/public/libz.lib
+++ b/sp/src/lib/public/libz.lib
diff --git a/sp/src/lib/public/linux32/bitmap.a b/sp/src/lib/public/linux32/bitmap.a
index 53c85947..a03e746b 100644
--- a/sp/src/lib/public/linux32/bitmap.a
+++ b/sp/src/lib/public/linux32/bitmap.a
diff --git a/sp/src/lib/public/linux32/choreoobjects.a b/sp/src/lib/public/linux32/choreoobjects.a
index 1bf42e68..d60beca8 100644
--- a/sp/src/lib/public/linux32/choreoobjects.a
+++ b/sp/src/lib/public/linux32/choreoobjects.a
diff --git a/sp/src/lib/public/linux32/dmxloader.a b/sp/src/lib/public/linux32/dmxloader.a
index 63ac2548..80f085c0 100644
--- a/sp/src/lib/public/linux32/dmxloader.a
+++ b/sp/src/lib/public/linux32/dmxloader.a
diff --git a/sp/src/lib/public/linux32/libSDL2-2.0.so.0 b/sp/src/lib/public/linux32/libSDL2-2.0.so.0
index 5908adb7..4cb32b6a 100644..100755
--- a/sp/src/lib/public/linux32/libSDL2-2.0.so.0
+++ b/sp/src/lib/public/linux32/libSDL2-2.0.so.0
diff --git a/sp/src/lib/public/linux32/libSDL2.so b/sp/src/lib/public/linux32/libSDL2.so
index d58bb41c..027f051a 100644..120000
--- a/sp/src/lib/public/linux32/libSDL2.so
+++ b/sp/src/lib/public/linux32/libSDL2.so
@@ -1 +1 @@
-libSDL2-2.0.so.0
+libSDL2-2.0.so.0
\ No newline at end of file
diff --git a/sp/src/lib/public/linux32/libsteam_api.so b/sp/src/lib/public/linux32/libsteam_api.so
index 6238c83e..6238c83e 100644..100755
--- a/sp/src/lib/public/linux32/libsteam_api.so
+++ b/sp/src/lib/public/linux32/libsteam_api.so
diff --git a/sp/src/lib/public/linux32/libtier0.so b/sp/src/lib/public/linux32/libtier0.so
index 0b856218..bece6f75 100644
--- a/sp/src/lib/public/linux32/libtier0.so
+++ b/sp/src/lib/public/linux32/libtier0.so
diff --git a/sp/src/lib/public/linux32/libvstdlib.so b/sp/src/lib/public/linux32/libvstdlib.so
index ff877923..2640250d 100644
--- a/sp/src/lib/public/linux32/libvstdlib.so
+++ b/sp/src/lib/public/linux32/libvstdlib.so
diff --git a/sp/src/lib/public/linux32/matsys_controls.a b/sp/src/lib/public/linux32/matsys_controls.a
index e17d6912..c999a735 100644
--- a/sp/src/lib/public/linux32/matsys_controls.a
+++ b/sp/src/lib/public/linux32/matsys_controls.a
diff --git a/sp/src/lib/public/linux32/particles.a b/sp/src/lib/public/linux32/particles.a
index 3eff3ec8..f8bdb0f6 100644
--- a/sp/src/lib/public/linux32/particles.a
+++ b/sp/src/lib/public/linux32/particles.a
diff --git a/sp/src/lib/public/linux32/shaderlib.a b/sp/src/lib/public/linux32/shaderlib.a
index 152dd01f..41b693c7 100644
--- a/sp/src/lib/public/linux32/shaderlib.a
+++ b/sp/src/lib/public/linux32/shaderlib.a
diff --git a/sp/src/lib/public/linux32/tier2.a b/sp/src/lib/public/linux32/tier2.a
index c35eefda..869c3c84 100644
--- a/sp/src/lib/public/linux32/tier2.a
+++ b/sp/src/lib/public/linux32/tier2.a
diff --git a/sp/src/lib/public/linux32/tier3.a b/sp/src/lib/public/linux32/tier3.a
index 85bc5036..b99b4f81 100644
--- a/sp/src/lib/public/linux32/tier3.a
+++ b/sp/src/lib/public/linux32/tier3.a
diff --git a/sp/src/lib/public/linux32/vtf.a b/sp/src/lib/public/linux32/vtf.a
index 668f2554..c5accec5 100644
--- a/sp/src/lib/public/linux32/vtf.a
+++ b/sp/src/lib/public/linux32/vtf.a
diff --git a/sp/src/lib/public/mathlib.lib b/sp/src/lib/public/mathlib.lib
index 5452e806..d1d71fd7 100644
--- a/sp/src/lib/public/mathlib.lib
+++ b/sp/src/lib/public/mathlib.lib
diff --git a/sp/src/lib/public/matsys_controls.lib b/sp/src/lib/public/matsys_controls.lib
index 3f508149..167517c6 100644
--- a/sp/src/lib/public/matsys_controls.lib
+++ b/sp/src/lib/public/matsys_controls.lib
diff --git a/sp/src/lib/public/nvtristrip.lib b/sp/src/lib/public/nvtristrip.lib
index 1ac1a83a..92ac3d4e 100644
--- a/sp/src/lib/public/nvtristrip.lib
+++ b/sp/src/lib/public/nvtristrip.lib
diff --git a/sp/src/lib/public/osx32/bitmap.a b/sp/src/lib/public/osx32/bitmap.a
index 0e0c885f..a1b496a8 100644
--- a/sp/src/lib/public/osx32/bitmap.a
+++ b/sp/src/lib/public/osx32/bitmap.a
diff --git a/sp/src/lib/public/osx32/choreoobjects.a b/sp/src/lib/public/osx32/choreoobjects.a
index 38241d5e..b3fa1ff4 100644
--- a/sp/src/lib/public/osx32/choreoobjects.a
+++ b/sp/src/lib/public/osx32/choreoobjects.a
diff --git a/sp/src/lib/public/osx32/dmxloader.a b/sp/src/lib/public/osx32/dmxloader.a
index 8bee889a..cb1729fb 100644
--- a/sp/src/lib/public/osx32/dmxloader.a
+++ b/sp/src/lib/public/osx32/dmxloader.a
diff --git a/sp/src/lib/public/osx32/libSDL2-2.0.0.dylib b/sp/src/lib/public/osx32/libSDL2-2.0.0.dylib
index 3fd8c749..c8dcd704 100644..100755
--- a/sp/src/lib/public/osx32/libSDL2-2.0.0.dylib
+++ b/sp/src/lib/public/osx32/libSDL2-2.0.0.dylib
diff --git a/sp/src/lib/public/osx32/libSDL2.dylib b/sp/src/lib/public/osx32/libSDL2.dylib
index 4122f22f..0384b98c 100644..120000
--- a/sp/src/lib/public/osx32/libSDL2.dylib
+++ b/sp/src/lib/public/osx32/libSDL2.dylib
@@ -1 +1 @@
-libSDL2-2.0.0.dylib
+libSDL2-2.0.0.dylib
\ No newline at end of file
diff --git a/sp/src/lib/public/osx32/libsteam_api.dylib b/sp/src/lib/public/osx32/libsteam_api.dylib
index 3eed40fe..3eed40fe 100644..100755
--- a/sp/src/lib/public/osx32/libsteam_api.dylib
+++ b/sp/src/lib/public/osx32/libsteam_api.dylib
diff --git a/sp/src/lib/public/osx32/libtier0.dylib b/sp/src/lib/public/osx32/libtier0.dylib
index 4adf7eb0..cdd1e710 100644..100755
--- a/sp/src/lib/public/osx32/libtier0.dylib
+++ b/sp/src/lib/public/osx32/libtier0.dylib
diff --git a/sp/src/lib/public/osx32/libvstdlib.dylib b/sp/src/lib/public/osx32/libvstdlib.dylib
index b4bb975a..5d461998 100644..100755
--- a/sp/src/lib/public/osx32/libvstdlib.dylib
+++ b/sp/src/lib/public/osx32/libvstdlib.dylib
diff --git a/sp/src/lib/public/osx32/matsys_controls.a b/sp/src/lib/public/osx32/matsys_controls.a
index 4a9271d1..e83b37a0 100644
--- a/sp/src/lib/public/osx32/matsys_controls.a
+++ b/sp/src/lib/public/osx32/matsys_controls.a
diff --git a/sp/src/lib/public/osx32/particles.a b/sp/src/lib/public/osx32/particles.a
index a0d3a387..c5dda2d6 100644
--- a/sp/src/lib/public/osx32/particles.a
+++ b/sp/src/lib/public/osx32/particles.a
diff --git a/sp/src/lib/public/osx32/shaderlib.a b/sp/src/lib/public/osx32/shaderlib.a
index acb84e34..52c298ae 100644
--- a/sp/src/lib/public/osx32/shaderlib.a
+++ b/sp/src/lib/public/osx32/shaderlib.a
diff --git a/sp/src/lib/public/osx32/tier2.a b/sp/src/lib/public/osx32/tier2.a
index 8421a097..cc1f50d8 100644
--- a/sp/src/lib/public/osx32/tier2.a
+++ b/sp/src/lib/public/osx32/tier2.a
diff --git a/sp/src/lib/public/osx32/tier3.a b/sp/src/lib/public/osx32/tier3.a
index f16de338..2795e730 100644
--- a/sp/src/lib/public/osx32/tier3.a
+++ b/sp/src/lib/public/osx32/tier3.a
diff --git a/sp/src/lib/public/osx32/vtf.a b/sp/src/lib/public/osx32/vtf.a
index 18bd45c8..c36609ae 100644
--- a/sp/src/lib/public/osx32/vtf.a
+++ b/sp/src/lib/public/osx32/vtf.a
diff --git a/sp/src/lib/public/particles.lib b/sp/src/lib/public/particles.lib
index b368fd75..5e61c7a0 100644
--- a/sp/src/lib/public/particles.lib
+++ b/sp/src/lib/public/particles.lib
diff --git a/sp/src/lib/public/raytrace.lib b/sp/src/lib/public/raytrace.lib
index 89968d7a..32b25be2 100644
--- a/sp/src/lib/public/raytrace.lib
+++ b/sp/src/lib/public/raytrace.lib
diff --git a/sp/src/lib/public/shaderlib.lib b/sp/src/lib/public/shaderlib.lib
index ffaeaac4..da6df422 100644
--- a/sp/src/lib/public/shaderlib.lib
+++ b/sp/src/lib/public/shaderlib.lib
diff --git a/sp/src/lib/public/tier0.lib b/sp/src/lib/public/tier0.lib
index 51f69f33..1a09ee27 100644
--- a/sp/src/lib/public/tier0.lib
+++ b/sp/src/lib/public/tier0.lib
diff --git a/sp/src/lib/public/tier1.lib b/sp/src/lib/public/tier1.lib
index 11161f7d..2e2cba26 100644
--- a/sp/src/lib/public/tier1.lib
+++ b/sp/src/lib/public/tier1.lib
diff --git a/sp/src/lib/public/tier2.lib b/sp/src/lib/public/tier2.lib
index 21e77fef..3d22c36e 100644
--- a/sp/src/lib/public/tier2.lib
+++ b/sp/src/lib/public/tier2.lib
diff --git a/sp/src/lib/public/tier3.lib b/sp/src/lib/public/tier3.lib
index d68a576f..5aecf6e0 100644
--- a/sp/src/lib/public/tier3.lib
+++ b/sp/src/lib/public/tier3.lib
diff --git a/sp/src/lib/public/vgui_controls.lib b/sp/src/lib/public/vgui_controls.lib
index d59d07be..ac7ffcd8 100644
--- a/sp/src/lib/public/vgui_controls.lib
+++ b/sp/src/lib/public/vgui_controls.lib
diff --git a/sp/src/lib/public/vmpi.lib b/sp/src/lib/public/vmpi.lib
index e67325c2..df1e7483 100644
--- a/sp/src/lib/public/vmpi.lib
+++ b/sp/src/lib/public/vmpi.lib
diff --git a/sp/src/lib/public/vstdlib.lib b/sp/src/lib/public/vstdlib.lib
index 9c676dce..94b81f56 100644
--- a/sp/src/lib/public/vstdlib.lib
+++ b/sp/src/lib/public/vstdlib.lib
diff --git a/sp/src/lib/public/vtf.lib b/sp/src/lib/public/vtf.lib
index e4b4985e..47ba0e4a 100644
--- a/sp/src/lib/public/vtf.lib
+++ b/sp/src/lib/public/vtf.lib