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

Naomi updates #23

Merged
merged 4 commits into from
Oct 28, 2014
Merged

Naomi updates #23

merged 4 commits into from
Oct 28, 2014

Conversation

p1pkin
Copy link
Member

@p1pkin p1pkin commented Oct 28, 2014

No description provided.

kingrt66 use real MaskROM cart layout and labels instead of flashcart [Arzeno Fabrice]
docs updates [MetalliC]
mmicko added a commit that referenced this pull request Oct 28, 2014
@mmicko mmicko merged commit 1ca9906 into mamedev:master Oct 28, 2014
@p1pkin
Copy link
Member Author

p1pkin commented Oct 28, 2014

Micko, can you give advice: how to avoid unrelated commits in pull request ?
I've created new branch and made there only one commit I want to submit,
but in pull request commits list I still have "line endings " "Merge branch 'master' of https://github.com/mamedev/mame " etc commits...

@mmicko
Copy link
Member

mmicko commented Oct 28, 2014

when you do things locally just do:

git stash
(that will save your currently changed files)
git pull
git stash apply
(will put back your changes and merge it in local)
and when you do commit it will be clean
also if you do it in branch and not in master you will not get things
overwritten by other changes
and I can auto-merge changes

On Tue, Oct 28, 2014 at 4:32 PM, MetalliC notifications@github.com wrote:

Micko, can you give advice: how to avoid unrelated commits in pull request
?
I've created new branch and made there only one commit I want to submit,
but in pull request commits list I still have "line endings " "Merge
branch 'master' of https://github.com/mamedev/mame " etc commits...


Reply to this email directly or view it on GitHub
#23 (comment).

@p1pkin
Copy link
Member Author

p1pkin commented Oct 28, 2014

thank you for explanation

note: updated MPR-xxxx roms for kingrt66 set can be get joining old ones ic1.bin+ic2.bin, ic3.bin+ic4.bin etc
I think there no reason to email them

@p1pkin p1pkin deleted the naomi#2 branch October 28, 2014 15:45
cuavas pushed a commit that referenced this pull request Jul 25, 2024
…2582)

* Improved some NV Magazine titles.
* Removed Removed "R・SYSTEM 3.2 (Japan)", (part of NV Magazine 1996-12).

New working software list items (msx2_flop.xml)
----------------------------
NV Hokkaido Vol. 1 (Japan) [file-hunter]
NV Magazine 1 (Japan) [file-hunter]
NV Magazine 2 (Japan) [file-hunter]
NV Magazine #3 (Japan) [file-hunter]
NV Magazine 4 (Japan) [file-hunter]
NV Magazine #5 (Japan) [file-hunter]
NV Magazine #7 (Japan) [file-hunter]
NV Magazine #8 (Japan) [file-hunter]
NV Magazine #9 (Japan) [file-hunter]
NV Magazine #10 (Japan) [file-hunter]
NV Magazine #20 (Japan) [file-hunter]
NV Magazine #21 (Japan) [file-hunter]
NV Magazine #22 (Japan) [file-hunter]
NV Magazine #23 (Japan) [file-hunter]
NV Magazine #24 (Japan) [file-hunter]
NV Magazine #26 (Japan) [file-hunter]
NV Magazine 1996-10 (Japan) [file-hunter]
NV Magazine 1996-11 (Japan) [file-hunter]
NV Magazine 1998-6 (Japan) [file-hunter]
NV Magazine 1998-9 (Japan) [file-hunter]
NV Magazine 1998-10 (Japan) [file-hunter]
NV Magazine 1999-1 (Japan) [file-hunter]
NV Magazine 1999-2 (Japan) [file-hunter]
NV Magazine 1999-3 (Japan) [file-hunter]
NV Magazine 1999-5 (Japan) [file-hunter]
NV Magazine 1999-6 (Japan) [file-hunter]
NV Magazine 1999-7 (Japan) [file-hunter]
NV Magazine 1999-8 (Japan) [file-hunter]
NV Magazine 1999-9 (Japan) [file-hunter]
NV Magazine 1999-10 (Japan) [file-hunter]
NV Magazine 1999-11 (Japan) [file-hunter]
NV Magazine 2000-1 (Japan) [file-hunter]
NV Magazine 2000-2 (Japan) [file-hunter]
NV Magazine 2000-3 (Japan) [file-hunter]
NV Magazine 2000-4 (Japan) [file-hunter]
NV Magazine 2000-5 (Japan) [file-hunter]
NV Magazine 2000-6 (Japan) [file-hunter]
NV Magazine 2000-7 (Japan) [file-hunter]
NV Magazine 2000-8 (Japan) [file-hunter]
NV Magazine 2000-9 (Japan) [file-hunter]
NV Magazine 2000-10 (Japan) [file-hunter]
NV Magazine 2000-11 (Japan) [file-hunter]
NV Magazine 2000-12 (Japan) [file-hunter]
NV Magazine 2002-1 (Japan) [file-hunter]
NV Magazine 2002-2 (Japan) [file-hunter]
NV Magazine 2002-4 (Japan) [file-hunter]
NV Magazine 2002-5 (Japan) [file-hunter]
NV Magazine SP #2 (Japan) [file-hunter]
NV Magazine Special #3 (Japan) [file-hunter]
NV Magazine Special #4 (Japan) [file-hunter]
NV Magazine Special #6 (Japan) [file-hunter]
NV RSDM #4 (Japan) [file-hunter]

New software list items marked not working (msx2_flop.xml)
----------------------------
NV Magazine 1996-12 (Japan) [file-hunter]
NV Magazine 1998-11 (Japan) [file-hunter]
NV Magazine 2001-12 (Japan) [file-hunter]
NV Magazine 2002-3 (Japan) [file-hunter]
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.

3 participants