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

fixes #2118 #2120

Merged
merged 5 commits into from Sep 14, 2016
Merged

fixes #2118 #2120

merged 5 commits into from Sep 14, 2016

Conversation

@ghost
Copy link

@ghost ghost commented Sep 6, 2016

vcs.Canvas.switchfonts() working and tested.

Edward Brown and others added 3 commits Sep 6, 2016
vcs.Canvas.switchfonts() now works.
Added test to ensure it works correctly.
@ghost
Copy link
Author

@ghost ghost commented Sep 6, 2016

@doutriaux1 @chaosphere2112 @mattben
VCS bugfix and test.

@doutriaux1
Copy link
Contributor

@doutriaux1 doutriaux1 commented Sep 14, 2016

@embrown there's some merge conflicts, do you mind fixing them? Thanks!

Conflicts:
	Packages/vcs/vcs/Canvas.py

Fixed merge conflict by removing reference to non-existing function.
@ghost
Copy link
Author

@ghost ghost commented Sep 14, 2016

@doutriaux1 Resolved and merged. Let me know if there's anything else I can do.

@doutriaux1 doutriaux1 merged commit eb1a5b5 into CDAT:master Sep 14, 2016
1 check failed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

1 participant