[backport] PR #6654 to 4.5 #6738
Closed
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
--------- **Commit 1:** Troubleshooting * Original sha: 81a9f29 * Authored by Shelby Sturgis <shelbyjsturgis@gmail.com> on 2016-03-22T21:44:17Z **Commit 2:** Merge branch 'master' into issue/6556 * Original sha: f628114 * Authored by Shelby Sturgis <shelbyjsturgis@gmail.com> on 2016-03-24T16:48:41Z **Commit 3:** troubleshooting * Original sha: 152f2b6 * Authored by Shelby Sturgis <shelbyjsturgis@gmail.com> on 2016-03-24T17:13:01Z **Commit 4:** Closes #6556. Fixes issue with global x and y axis selection. * Original sha: 2ffbb76 * Authored by Shelby Sturgis <shelbyjsturgis@gmail.com> on 2016-03-24T22:44:54Z **Commit 5:** Merge branch 'master' into issue/6556 * Original sha: da025aa * Authored by Shelby Sturgis <shelbyjsturgis@gmail.com> on 2016-03-24T22:45:12Z **Commit 6:** Merge branch 'master' into issue/6556 * Original sha: cf4a152 * Authored by Shelby Sturgis <shelbyjsturgis@gmail.com> on 2016-03-24T22:45:50Z **Commit 7:** fixing tests * Original sha: b2f26e7 * Authored by Shelby Sturgis <shelbyjsturgis@gmail.com> on 2016-03-25T16:55:30Z **Commit 8:** Merge branch 'master' into issue/6556 * Original sha: a56c5d5 * Authored by Shelby Sturgis <shelbyjsturgis@gmail.com> on 2016-03-25T17:51:21Z **Commit 9:** refactoring * Original sha: b42f5bf * Authored by Shelby Sturgis <shelbyjsturgis@gmail.com> on 2016-03-25T21:43:59Z **Commit 10:** Merge branch 'master' into issue/6556 * Original sha: 7f96a11 * Authored by Shelby Sturgis <shelbyjsturgis@gmail.com> on 2016-03-28T22:59:03Z
|
Closing due to weird conflicts. |
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.
Backport PR #6654
Commit 1:
Troubleshooting
Commit 2:
Merge branch 'master' into issue/6556
Commit 3:
troubleshooting
Commit 4:
Closes #6556. Fixes issue with global x and y axis selection.
Commit 5:
Merge branch 'master' into issue/6556
Commit 6:
Merge branch 'master' into issue/6556
Commit 7:
fixing tests
Commit 8:
Merge branch 'master' into issue/6556
Commit 9:
refactoring
Commit 10:
Merge branch 'master' into issue/6556