Glade tutorial branch fixed #3160
Merged
Conversation
This file contains hidden or 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
Conflicts: doc/users/developer.rst
Contributor
|
@WeatherGod - Thanks for taking the time to fix this. It is not important for me to claim authorship for this example. You can go ahead and sqash the edits. I am sure I will make another contribution, but first I have to learn about branching and some other git stuff. |
Member
Author
|
Travis failure appear to be the usual timeout error that sometimes happens. As for squashing, since I have zero expertise with Glade, I wouldn't want to be the one who would seem to be the resident expert. I am going to go ahead and merge this since it was already approved in the other PR. |
WeatherGod
added a commit
that referenced
this pull request
Jun 28, 2014
Glade tutorial branch fixed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Replaces the borked PR #3088. This is not squashed as I did not want to remove @spiessbuerger 's authorship on this work.