mirror of
https://github.com/SabreTools/MPF.git
synced 2026-02-03 21:29:27 +00:00
[PR #5] [MERGED] Combine IBM PC-CD options, misc fixes #897
Reference in New Issue
Block a user
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/SabreTools/MPF/pull/5
Author: @mnadareski
Created: 5/14/2018
Status: ✅ Merged
Merged: 5/14/2018
Merged by: @undefined
Base:
master← Head:master📝 Commits (5)
5b777c3Combine IBM PC-CD options, fix "no copy protection"bfca669Merge branch 'master' of https://github.com/mnadareski/DICUI16ae5e1Fix automatic merge issuesc0cf207Ensure tabbing stays the same with source039cbf6Merge branch 'master' into master📊 Changes
2 files changed (+4 additions, -22 deletions)
View changed files
📝
MainWindow.xaml(+1 -4)📝
MainWindow.xaml.cs(+3 -18)📄 Description
This commit consolidates the 4 IBM PC-CD variants into a single option. This will reduce the amount of confusion to new users in the future since they will be able to dump any CD right off the bat. The other commits dealt with merge issues I had due to not syncing branches before making my changes. I believe I also added "bd" as the type for BD-Video and changed the Audio CD type to "cd", since the "audio" command is more fiddly than it seems.
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.