Merge branch '1912'
22b55c985cab
Actions

Authored by mardelle on Dec 4 2019, 10:10 PM.

Description

Merge branch '1912'

Committed

mardelle

Dec 4 2019, 10:10 PM

Parents

Branches

Unknown

Tags

Unknown

	Commit			Author	Details	Committed
	7b474696d5f8			mardelle	Correctly import guides and markers from 18.x projects	Dec 4 2019
	630df2675be4			mardelle	Fix seeking back 1 frame after play broken.	Dec 4 2019

				Path	Packages
	M			src/doc/documentvalidator.cpp
	M			src/monitor/glwidget.cpp
	M			src/monitor/monitor.cpp
	M			src/monitor/monitorproxy.cpp
	M			src/monitor/monitorproxy.h
	M			src/monitor/view/MonitorRuler.qml
	M			src/timeline2/view/qml/timeline.qml