mirror of
https://github.com/lutris/osmose.git
synced 2026-11-05 01:27:19 +00:00
[PR #7] [MERGED] Fix line endings and small organisation fixes #13
Labels
No labels
pull-request
No milestone
No project
No assignees
1 participant
Notifications
Due date
No due date set.
Dependencies
No dependencies set.
Reference
lutris/osmose#13
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "%!s()"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
📋 Pull Request Information
Original PR: https://github.com/lutris/osmose/pull/7
Author: @akien-mga
Created: 1/12/2016
Status: ✅ Merged
Merged: 1/14/2016
Merged by: @strycore
Base:
master← Head:pr-line-endings📝 Commits (5)
62d0e50Update .gitignore for executable name change9dd0440Add .gitattributes to enforce LF line endings5765f36Rename .pro file to dehardcode version205b96eAdd Makefile to .gitignore, it is generated by QMake079de63Normalize all the line endings to LF📊 Changes
17 files changed (+12482 additions, -13268 deletions)
View changed files
➕
.gitattributes(+1 -0)📝
.gitignore(+2 -1)➖
Makefile(+0 -788)📝
Osmose.pro(+0 -0)📝
cpu/BasicTypes.h(+45 -45)📝
cpu/Opc_cbxx.cpp(+2098 -2098)📝
cpu/Opc_dd.cpp(+931 -931)📝
cpu/Opc_ddcb.cpp(+2268 -2268)📝
cpu/Opc_ed.cpp(+931 -931)📝
cpu/Opc_fd.cpp(+932 -932)📝
cpu/Opc_fdcb.cpp(+2269 -2269)📝
cpu/Opc_std.cpp(+2395 -2395)📝
emulator/AnsiColorTerminal.h(+59 -59)📝
emulator/IOMapper_GG.cpp(+184 -184)📝
emulator/IOMapper_GG.h(+51 -51)📝
emulator/VDP_GG.cpp(+271 -271)📝
emulator/VDP_GG.h(+45 -45)📄 Description
If it can be merged quickly, I'll need it for the rest of my changes from #5 that I want to propose in a distinct PR, the line endings change makes cherry-picking, etc. pretty difficult right now :)
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.