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.

Sign up for GitHub

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

Jump to bottom

Merge master 0.2.6 into develop #721

Merged
merged 3 commits into from
Aug 25, 2021
Merged

Merge master 0.2.6 into develop #721

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
73b009d
Update Version to 0.2.6 SO 20
JacksonRG Aug 19, 2021
3275251
Merge pull request #720 from OpenShot/release-20210819
JacksonRG Aug 25, 2021
569b591
Merge master 0.2.6 into develop
Aug 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ For more information, please visit <http://www.openshot.org/>.
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules")

################ PROJECT VERSION ####################
set(PROJECT_VERSION_FULL "0.2.5-dev3")
set(PROJECT_SO_VERSION 19)
set(PROJECT_VERSION_FULL "0.2.6-dev")
set(PROJECT_SO_VERSION 20)

# Remove the dash and anything following, to get the #.#.# version for project()
STRING(REGEX REPLACE "\-.*$" "" VERSION_NUM "${PROJECT_VERSION_FULL}")
Expand Down