Renamed TARGET_GHI_MBUINO to TARGET_OC_MBUINO to match the new name of t... #445
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
|
commit ab5ed98 was not accepted as there were merging conflicts. For commit 519f3e4, I synced my fork with mbed main via pulling an upstream remote with the assistance the help on github. I fixed the merge conflicts and recommitted. For the final commit, you will see from the first commit under this file: workspace_tools/build_travis.py lines 11, 12, and 13 were not deleted. They became deleted from the merge of the second commit. Please advise if these lines were removed by mistake. I do not know from where any of the merge changes came if they were not part of my first commit. |
|
These lines should not have been deleted. |
…platform change as well as the TARGET_GHI_MBUINO to TARGET_OC_MBUINO directory.
bogdanm
added a commit
that referenced
this pull request
Aug 18, 2014
Renamed TARGET_GHI_MBUINO to TARGET_OC_MBUINO to match the new name of t...
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.
...he platform;
Modified build_release.py, build_travis.py, and targets.py to accommodate the new name of OC_MBUINO from GHI_MBUINO.