mednaffe: GTK3, correct license, find mednafen w/o patching source #29958
Conversation
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
|
Thanks! Looks like a merge conflict in travis (but not in github which is weird). |
lukateras
force-pushed
the
mednaffe/0.8.6
branch
from
b605056
to
44e387d
Compare
|
I've rebased on top of master (if that would help), with no conflicts. |
lukateras
force-pushed
the
mednaffe/0.8.6
branch
from
44e387d
to
687367b
Compare
lukateras
force-pushed
the
mednaffe/0.8.6
branch
from
687367b
to
e1cc156
Compare
|
And... I don't see my commit in this pull request for some reason. Please see mednaffe/0.8.6 branch, 1 commit ahead of NixOS:master at this moment. |
|
@yegortimoshenko Looks like you amended the commit? I'm sure that causes some complications when cascading branch changes to their PRs. |
|
I see the commit here the same way as on your branch, as expected from GitHub. |
vcunat
approved these changes
Oct 1, 2017
vcunat
added a commit
that referenced
this pull request
Oct 1, 2017
|
Great! Thanks to @yegortimoshenko :) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
/cc @AmatCoder
Motivation for this change
See #29855 (comment).
Things done
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)