pull the file in from develop to fix the issue #10 #13
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
|
Wouldn't this be achieved by just pushing into master? I'm confused what's going on here. |
|
Actually I think these are all in feature/cleanup. Feh. I didn't realize those weren't merged yet. |
|
Just updated develop with the feature/cleanup branch that I had local. Please check to see if this pull request is still needed. |
craigmaloney
requested changes
Oct 4, 2018
capture.py
Outdated
| @@ -3,7 +3,18 @@ | |||
| import os | |||
| import pygame | |||
| import pygame.camera | |||
| from pygame.locals import * | |||
| from pygame.locals import ( | |||
There was a problem hiding this comment.
These appear to be committed with the latest merge of my feature branch. Please confirm.
Develop to master merge
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.
I successfully tested the capture file in both develop and my master branch to make sure it would allow me to run the software from various directories which solves issue #10