openshot:master

Last commit made on 2020-03-03
Get this branch:
git clone -b master https://git.launchpad.net/openshot
Members of OpenShot Code can upload to this branch. Log in for directions.

Branch merges

Branch information

Name:
master
Repository:
lp:openshot

Recent commits

e67abe7... by Jonathan Thomas on 2020-03-03

Merge pull request #3263 from OpenShot/release-20200229

Release branch for openshot-qt 2.5.1 (required libopenshot version 0.2.5)

df8baf0... by FeRD (Frank Dana) on 2020-03-01

Merge branch 'osp-file-repair' into release-20200229

4ed2c2f... by FeRD (Frank Dana) on 2020-03-01

json_data: Correct for lost slashes, pre-repair

f792a4a... by Jonathan Thomas on 2020-02-29

Release branch for 2.5.1 (min libopenshot version 0.2.5)

777cf1f... by Jonathan Thomas on 2020-02-29

Merge pull request #3261 from OpenShot/update-translations-2-5-1

Bump version to 2.5.1 (and update translations, cache, supporters)

f044d07... by SuslikV <vx2010@i.ua> on 2020-02-29

Fix formatting of repaired JSON data (#3262)

Save repaired data with indents / pretty-printing

d28befd... by SuslikV <vx2010@i.ua> on 2020-02-29

Add thumbnail to the audio only clip (#3249)

If image is not present in audio file the thumbnail is still needed,
otherwise it will be rendered as black rectangle in the Timeline.

35b65e8... by Jonathan Thomas on 2020-02-29

Updating release date and appdata.xml entry

8201f31... by Jonathan Thomas on 2020-02-28

Merge pull request #3187 from ferdnyc/pending

Add pending_action tracking to update manager

ddf89b9... by Jonathan Thomas on 2020-02-28

Merge pull request #3181 from ferdnyc/filter

Protect filter() against damaged projects