Merge master into develop (take 2) #431
Merged
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
…crashing Travis due to the dependency on libopenshot PPA (which only has the develop version number). Need to think about this more.
…ld work now, since we've updated the versions on `develop`.
…ious tag. During a release, we tag the current commit during the publishing, and then it starts detecting no changes (since we are ON the current tag).
… not see any crazy memory demands from this.
Release of libopenshot 0.2.4 (SO 18)
# Conflicts: # CMakeLists.txt
Codecov Report
@@ Coverage Diff @@
## develop #431 +/- ##
========================================
Coverage 42.37% 42.37%
========================================
Files 129 129
Lines 13276 13276
========================================
Hits 5626 5626
Misses 7650 7650
Continue to review full report at Codecov.
|
ghost
mentioned this pull request
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.
No description provided.