Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Always use LF line endings, even on Windows (#2489)" #2492

Merged
merged 1 commit into from
Feb 28, 2025

Conversation

cadmic
Copy link
Contributor

@cadmic cadmic commented Feb 28, 2025

this seem to want to edit binary files too (and the ZAPD files have CRLF in the repo)

warning: in the working copy of 'docs/audio/build_flowchart.png', CRLF will be replaced by LF the next time Git touches it
warning: in the working copy of 'docs/logo.png', CRLF will be replaced by LF the next time Git touches it
warning: in the working copy of 'tools/ZAPD/ExporterTest/ExporterTest.vcxproj', CRLF will be replaced by LF the next time Git touches it
warning: in the working copy of 'tools/ZAPD/ZAPD/ZAPD.vcxproj', CRLF will be replaced by LF the next time Git touches it
warning: in the working copy of 'tools/ZAPD/ZAPD/ZAPD.vcxproj.filters', CRLF will be replaced by LF the next time Git touches it
warning: in the working copy of 'tools/ZAPD/ZAPD/ZActorList.cpp', CRLF will be replaced by LF the next time Git touches it
warning: in the working copy of 'tools/ZAPD/ZAPD/ZActorList.h', CRLF will be replaced by LF the next time Git touches it
warning: in the working copy of 'tools/ZAPD/ZAPD/ZSurfaceType.cpp', CRLF will be replaced by LF the next time Git touches it
warning: in the working copy of 'tools/ZAPD/ZAPD/ZSurfaceType.h', CRLF will be replaced by LF the next time Git touches it
warning: in the working copy of 'tools/ZAPD/ZAPDUtils/ZAPDUtils.vcxproj', CRLF will be replaced by LF the next time Git touches it
warning: in the working copy of 'tools/ZAPD/docs/zapd_warning_example.png', CRLF will be replaced by LF the next time Git touches it
warning: in the working copy of 'tools/asm-differ/screenshot.png', CRLF will be replaced by LF the next time Git touches it
warning: in the working copy of 'tools/ido5.3_compiler/usr/lib/as1', CRLF will be replaced by LF the next time Git touches it
warning: in the working copy of 'tools/ido5.3_compiler/usr/lib/cfe', CRLF will be replaced by LF the next time Git touches it
warning: in the working copy of 'tools/ido5.3_compiler/usr/lib/libc.so.1', CRLF will be replaced by LF the next time Git touches it
warning: in the working copy of 'tools/ido5.3_compiler/usr/lib/umerge', CRLF will be replaced by LF the next time Git touches it
warning: in the working copy of 'tools/ido7.1_compiler/lib/libc.so.1', CRLF will be replaced by LF the next time Git touches it
warning: in the working copy of 'tools/ido7.1_compiler/lib/rld', CRLF will be replaced by LF the next time Git touches it
warning: in the working copy of 'tools/ido7.1_compiler/usr/lib/as1', CRLF will be replaced by LF the next time Git touches it
warning: in the working copy of 'tools/ido7.1_compiler/usr/lib/cfe', CRLF will be replaced by LF the next time Git touches it
warning: in the working copy of 'tools/ido7.1_compiler/usr/lib/libc.so.1', CRLF will be replaced by LF the next time Git touches it
warning: in the working copy of 'tools/ido7.1_compiler/usr/lib/libexc.so', CRLF will be replaced by LF the next time Git touches it

@fig02 fig02 merged commit 3d1af54 into zeldaret:main Feb 28, 2025
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants