This repository has been archived by the owner on Oct 15, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 340
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "[Merge chakra-core/ChakraCore@42789b26e3] Skip 1.6 commit"
This reverts commit c6863c0. The commit should have been a no-op, but was accidentally a bunch of line ending changes that cause issues for xplat.
- Loading branch information
Showing
37 changed files
with
14,561 additions
and
14,561 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| *.baseline -crlf | ||
| *.cmd -crlf | ||
| test/**/*.js -crlf | ||
| test/es6/HTMLComments.js binary diff=cpp | ||
| *.wasm binary | ||
| *.cpp text eol=lf diff=cpp | ||
| *.h text eol=lf diff=cpp | ||
| *.inl text eol=lf diff=cpp | ||
| *.vcproj text eol=crlf diff=xml | ||
| *.vcxproj text eol=crlf diff=xml | ||
| *.sln text eol=crlf diff=xml | ||
| *.baseline -crlf | ||
| *.cmd -crlf | ||
| test/**/*.js -crlf | ||
| test/es6/HTMLComments.js binary diff=cpp | ||
| *.wasm binary | ||
| *.cpp text eol=lf diff=cpp | ||
| *.h text eol=lf diff=cpp | ||
| *.inl text eol=lf diff=cpp | ||
| *.vcproj text eol=crlf diff=xml | ||
| *.vcxproj text eol=crlf diff=xml | ||
| *.sln text eol=crlf diff=xml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,109 +1,109 @@ | ||
| # Visual Studio | ||
| *_i.c | ||
| *_p.c | ||
| *.aps | ||
| *.bak | ||
| *.cache | ||
| *.dll | ||
| *.err | ||
| *.exe | ||
| *.i | ||
| *.ilk | ||
| *.lib | ||
| *.log | ||
| *.ncb | ||
| *.obj | ||
| *.opendb | ||
| *.opensdf | ||
| *.pch | ||
| *.pdb | ||
| *.sbr | ||
| *.sdf | ||
| *.suo | ||
| *.tlb | ||
| *.tlh | ||
| *.user | ||
| *.VC.db | ||
| *.vcxproj.user | ||
| *.vspscc | ||
| *.wrn | ||
| .vs/ | ||
|
|
||
| # Visual Studio Extensions | ||
| *.vadbg | ||
| *.args.json | ||
|
|
||
| # Build Artifacts | ||
| build_*.err | ||
| build_*.log | ||
| build_*.wrn | ||
| Build/ipch/ | ||
| Build/swum-cache.txt | ||
| Build/VCBuild.NoJIT/ | ||
| Build/VCBuild.SWB/ | ||
| Build/VCBuild/ | ||
| buildchk.* | ||
| buildfre.* | ||
| out/ | ||
| _DROP/ | ||
|
|
||
| # Generated Files | ||
| *.bc | ||
| *.dpl.* | ||
| *.nupkg | ||
| *.pyc | ||
| *.tlog/ | ||
| /test/_ttdlog/* | ||
| ComputedEnvironment.cmd | ||
| packages/ | ||
| profile.dpl.* | ||
| sd.ini | ||
| test/*/*.baseline.rebase | ||
| test/benchmarks/*.dpl | ||
| test/benchmarks/*.txt | ||
| testout* | ||
| packages.config | ||
| lib/wabt/built/ | ||
|
|
||
| # CMake Files | ||
| cmake_install.cmake | ||
| CMakeCache.txt | ||
| CMakeFiles | ||
| CMakeScripts | ||
| install_manifest.txt | ||
|
|
||
| # xcode | ||
| *.xcodeproj | ||
| *.xcworkspace | ||
|
|
||
| # VIM | ||
| .*.swo | ||
| .*.swp | ||
| tags | ||
|
|
||
| # VS Code | ||
| .vscode/ | ||
|
|
||
| # additional *nix generated files | ||
| *.a | ||
| *.gch | ||
| *.o | ||
| *.so | ||
| *.dylib | ||
| Makefile | ||
| pal/src/config.h | ||
| DbgController.js.h | ||
| lib/wabt/built/config.h | ||
|
|
||
| # Generated by other tools | ||
| *.lldb.cmd | ||
| *.orig | ||
| deps/ | ||
|
|
||
| .DS_Store | ||
| android-toolchain-arm/ | ||
| cc-toolchain/ | ||
| /TraceOutput.txt | ||
| Build/VcBuild | ||
| Build/VcBuild.NoJIT | ||
| Build/VcBuild.SWB | ||
| # Visual Studio | ||
| *_i.c | ||
| *_p.c | ||
| *.aps | ||
| *.bak | ||
| *.cache | ||
| *.dll | ||
| *.err | ||
| *.exe | ||
| *.i | ||
| *.ilk | ||
| *.lib | ||
| *.log | ||
| *.ncb | ||
| *.obj | ||
| *.opendb | ||
| *.opensdf | ||
| *.pch | ||
| *.pdb | ||
| *.sbr | ||
| *.sdf | ||
| *.suo | ||
| *.tlb | ||
| *.tlh | ||
| *.user | ||
| *.VC.db | ||
| *.vcxproj.user | ||
| *.vspscc | ||
| *.wrn | ||
| .vs/ | ||
|
|
||
| # Visual Studio Extensions | ||
| *.vadbg | ||
| *.args.json | ||
|
|
||
| # Build Artifacts | ||
| build_*.err | ||
| build_*.log | ||
| build_*.wrn | ||
| Build/ipch/ | ||
| Build/swum-cache.txt | ||
| Build/VCBuild.NoJIT/ | ||
| Build/VCBuild.SWB/ | ||
| Build/VCBuild/ | ||
| buildchk.* | ||
| buildfre.* | ||
| out/ | ||
| _DROP/ | ||
|
|
||
| # Generated Files | ||
| *.bc | ||
| *.dpl.* | ||
| *.nupkg | ||
| *.pyc | ||
| *.tlog/ | ||
| /test/_ttdlog/* | ||
| ComputedEnvironment.cmd | ||
| packages/ | ||
| profile.dpl.* | ||
| sd.ini | ||
| test/*/*.baseline.rebase | ||
| test/benchmarks/*.dpl | ||
| test/benchmarks/*.txt | ||
| testout* | ||
| packages.config | ||
| lib/wabt/built/ | ||
|
|
||
| # CMake Files | ||
| cmake_install.cmake | ||
| CMakeCache.txt | ||
| CMakeFiles | ||
| CMakeScripts | ||
| install_manifest.txt | ||
|
|
||
| # xcode | ||
| *.xcodeproj | ||
| *.xcworkspace | ||
|
|
||
| # VIM | ||
| .*.swo | ||
| .*.swp | ||
| tags | ||
|
|
||
| # VS Code | ||
| .vscode/ | ||
|
|
||
| # additional *nix generated files | ||
| *.a | ||
| *.gch | ||
| *.o | ||
| *.so | ||
| *.dylib | ||
| Makefile | ||
| pal/src/config.h | ||
| DbgController.js.h | ||
| lib/wabt/built/config.h | ||
|
|
||
| # Generated by other tools | ||
| *.lldb.cmd | ||
| *.orig | ||
| deps/ | ||
|
|
||
| .DS_Store | ||
| android-toolchain-arm/ | ||
| cc-toolchain/ | ||
| /TraceOutput.txt | ||
| Build/VcBuild | ||
| Build/VcBuild.NoJIT | ||
| Build/VcBuild.SWB |
Oops, something went wrong.