search

sensics / OSVR-RenderManager

Apache License 2.0
64 stars 45 forks source link

Normalize line endings #112

Closed godbyk closed 8 years ago

godbyk commented 8 years ago

This pull request normalizes all the line-endings so we don't have mixed CR, LF, and CRLF endings in the same file. With the provided .gitattributes file (copied from OSVR-Core), git will automatically convert the line endings on commit and checkout and keep things consistent.

rpavlik commented 8 years ago

I was just wondering about this when doing some rm work Friday...

On Mon, Jun 20, 2016, 11:44 AM Kevin Godby notifications@github.com wrote:

This pull request normalizes all the line-endings so we don't have mixed CR, LF, and CRLF endings in the same file. With the provided .gitattributes file (copied from OSVR-Core), git will automatically

convert the line endings on commit and checkout and keep things consistent.

You can view, comment on, or merge this pull request online at:

https://github.com/sensics/OSVR-RenderManager/pull/112 Commit Summary

  • Adding .gitattributes file to handle line-endings.
  • Normalize all the line endings.

File Changes

Patch Links:

— You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub https://github.com/sensics/OSVR-RenderManager/pull/112, or mute the thread https://github.com/notifications/unsubscribe/AADuyR8MHpsM-l8df2zDCCg0F9lvRI3aks5qNsN2gaJpZM4I55PB .

Ryan A. Pavlik, Ph.D. CTO - OSVR Platform Sensics, Inc. www.sensics.com

Latest news and blog posts (subscribe here http://sensics.com/subscribe-to-our-mailing-list/ go get weekly updates):

June 17: Notes from the Zero Latency free-roam VR gameplay http://sensics.com/notes-from-the-zero-latency-free-roam-vr-gameplay/

June 15: VRguy podcast: Jens Christensen, former CEO of Jaunt VR, on the video value chain in VR http://sensics.com/vrguy-podcast-episode-15-jens-christensen-on-360-and-3d-video-in-vr/

June 13: OSVR unveils dual-display 2160x1200 90 Hz headset http://sensics.com/osvr-unveils-open-source-2160-x-1200-dual-display-headset/

godbyk commented 8 years ago

@rpavlik Yeah, I fixed a few by hand when I noticed them, but it makes resolving conflicts between branches a huge PITA. So I finally took the time to tackle them all at once.