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

C64 390 #20

Merged
merged 11 commits into from
Aug 3, 2020
Merged

C64 390 #20

merged 11 commits into from
Aug 3, 2020

Conversation

pzembrod
Copy link
Collaborator

@pzembrod pzembrod commented Aug 3, 2020

Finally get the non-bank-switching C16-32k-RAM version of VolksForth working again. It used to crash on the first input.

No idea why your README change is part of this, too. All should be up to date in the relevant branches; from what I can see, this change shouldn't be part of this pull request. Feel free to reject this pull request if there's anything I should be doing differently.

@cstrotm
Copy link
Collaborator

cstrotm commented Aug 3, 2020

Hi Philip,

i see in the git commit msgs:

Merge branch 'master' of https://github.com/forth-ev/VolksForth into …
dedc8f4 …c64-390

You probably should merge "c64-390" from the upstream to your c64-390, not the master branch.

I will see if I can cherry pick your changes

@cstrotm
Copy link
Collaborator

cstrotm commented Aug 3, 2020

Hi Philip,

I'm done with cherrypicking. Can you pull the C64-390 branch from upstream and check with your version to see if I've got all your changes?

@cstrotm cstrotm merged commit d58c9a5 into forth-ev:c64-390 Aug 3, 2020
@pzembrod
Copy link
Collaborator Author

pzembrod commented Aug 3, 2020 via email

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