JMR-dev eb37f9ebea Merge branch 'fix/reattach-unfinished-work' into scratch/integrate-d2-d3 ...

# Conflicts:
#	app/src/main/java/org/libremediaconverter/join/JoinViewModel.kt

2026-08-22 18:45:03 -05:00

..

codec

Apply ktlintFormat

2026-08-22 14:10:44 -05:00

convert

Merge branch 'fix/reattach-unfinished-work' into scratch/integrate-d2-d3

2026-08-22 18:45:03 -05:00

ffmpeg

Apply ktlintFormat

2026-08-22 14:10:44 -05:00

join

Merge branch 'fix/reattach-unfinished-work' into scratch/integrate-d2-d3

2026-08-22 18:45:03 -05:00

model

Clear the 35 findings the new tools reported

2026-08-22 14:21:15 -05:00

ui

Apply ktlintFormat

2026-08-22 14:10:44 -05:00

work

Reattach to conversions and joins the ViewModel did not start

2026-08-22 18:43:10 -05:00

LibreMediaConverterApp.kt

Delete staged output the user never saved, instead of waiting for the OS

2026-08-22 18:40:29 -05:00

MainActivity.kt

Apply ktlintFormat

2026-08-22 14:10:44 -05:00