Skip to content

Actions: OpenShot/libopenshot

Actions

Label merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
label-merge-conflicts.yml
80 workflow runs
80 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Experimental support to correctly convert 10-bit color into 8-bit col… Label merge conflicts #866: Commit 2f576e2 pushed by jonoomph
January 6, 2025 04:04 9s colorspace-10-bit
colorspace-10-bit
January 6, 2025 04:04 9s
Merge pull request #985 from OpenShot/java-package Label merge conflicts #865: Commit dd2a70c pushed by jonoomph
December 31, 2024 06:08 1m 10s develop
develop
December 31, 2024 06:08 1m 10s
Fixing swig java support to generate a package (org.openshot) and cor… Label merge conflicts #864: Commit 5cb74f4 pushed by jonoomph
December 31, 2024 05:50 10s java-package
java-package
December 31, 2024 05:50 10s
Merge pull request #984 from OpenShot/release-20241221 Label merge conflicts #863: Commit 6d8db5c pushed by jonoomph
December 23, 2024 00:09 1m 14s develop
develop
December 23, 2024 00:09 1m 14s
Bump version to 0.4.0 (SO: 27) for release of OpenShot 3.3 Label merge conflicts #862: Commit 621eb57 pushed by jonoomph
December 22, 2024 19:13 11s v0.4.0
v0.4.0
December 22, 2024 19:13 11s
Bump version to 0.4.0 (SO: 27) for release of OpenShot 3.3 Label merge conflicts #861: Commit 621eb57 pushed by jonoomph
December 21, 2024 22:34 12s release-20241221
release-20241221
December 21, 2024 22:34 12s
Merge pull request #983 from OpenShot/recovery-menu Label merge conflicts #860: Commit 1107e9f pushed by jonoomph
December 13, 2024 03:05 1m 14s develop
develop
December 13, 2024 03:05 1m 14s
Another fix for Qt Split, due to older version of Qt on Linux builder… Label merge conflicts #859: Commit db73d22 pushed by jonoomph
December 10, 2024 05:38 10s recovery-menu
recovery-menu
December 10, 2024 05:38 10s
Fixing GetMinFrame() function to correctly + 1, since our starting fr… Label merge conflicts #858: Commit 5977483 pushed by jonoomph
December 10, 2024 05:30 13s recovery-menu
recovery-menu
December 10, 2024 05:30 13s
Targeting 10.12, using 10.14 SDK due to Catch2 Label merge conflicts #857: Commit 05aaba6 pushed by jonoomph
December 10, 2024 04:42 9s recovery-menu
recovery-menu
December 10, 2024 04:42 9s
Adding back Mac build to Gitlab CI #2, targeting SDK 10.14 Label merge conflicts #856: Commit 5c1431a pushed by jonoomph
December 10, 2024 04:36 10s recovery-menu
recovery-menu
December 10, 2024 04:36 10s
Adding back Mac build to Gitlab CI Label merge conflicts #855: Commit d1b6f66 pushed by jonoomph
December 10, 2024 04:34 13s recovery-menu
recovery-menu
December 10, 2024 04:34 13s
Adding default audio buffer size to libopenshot settings, and setting… Label merge conflicts #854: Commit a25513b pushed by jonoomph
December 9, 2024 21:15 11s recovery-menu
recovery-menu
December 9, 2024 21:15 11s
Experimental audio device manager buffer size of 512 (instead of defa… Label merge conflicts #853: Commit ad5a600 pushed by jonoomph
December 9, 2024 20:10 10s recovery-menu
recovery-menu
December 9, 2024 20:10 10s
Debug in AudioReaderSource for Win 11 debugging #2 Label merge conflicts #852: Commit 339a491 pushed by jonoomph
December 9, 2024 06:59 12s recovery-menu
recovery-menu
December 9, 2024 06:59 12s
Debug in AudioReaderSource for Win 11 debugging Label merge conflicts #851: Commit d1d9896 pushed by jonoomph
December 9, 2024 03:35 12s recovery-menu
recovery-menu
December 9, 2024 03:35 12s
Experimental change in audio thread sleep/waiting when paused Label merge conflicts #850: Commit bdb5015 pushed by jonoomph
December 9, 2024 00:24 11s recovery-menu
recovery-menu
December 9, 2024 00:24 11s
Making all thread priorities "high" Label merge conflicts #849: Commit fad9ae9 pushed by jonoomph
December 8, 2024 22:35 13s recovery-menu
recovery-menu
December 8, 2024 22:35 13s
Adding back win 32 build to gitlab ci Label merge conflicts #848: Commit d005751 pushed by jonoomph
December 8, 2024 22:32 9s recovery-menu
recovery-menu
December 8, 2024 22:32 9s
Temporarily remove win32 and mac builds, to test JUCE 7.0.8 and CXX s… Label merge conflicts #847: Commit 3f68bc4 pushed by jonoomph
December 8, 2024 20:02 11s recovery-menu
recovery-menu
December 8, 2024 20:02 11s
Adding audio device type to debug Label merge conflicts #846: Commit 2a958bc pushed by jonoomph
December 7, 2024 23:49 12s recovery-menu
recovery-menu
December 7, 2024 23:49 12s
Upgrading to JUCE v8.0.4: Label merge conflicts #845: Commit bcda987 pushed by jonoomph
December 7, 2024 22:48 10s recovery-menu
recovery-menu
December 7, 2024 22:48 10s
Adding audio device type to debug Label merge conflicts #844: Commit 2a958bc pushed by jonoomph
December 7, 2024 18:16 11s recovery-menu
recovery-menu
December 7, 2024 18:16 11s
Adding debug for audio device initialization for debugging on Windows 11 Label merge conflicts #843: Commit b2a96cc pushed by jonoomph
December 7, 2024 17:29 9s recovery-menu
recovery-menu
December 7, 2024 17:29 9s
Merge pull request #975 from OpenShot/choose-profile-v2 Label merge conflicts #842: Commit 09ca2ce pushed by jonoomph
October 12, 2024 20:18 1m 10s develop
develop
October 12, 2024 20:18 1m 10s