merge with master and fix 2 conflicts
[ardour.git] / libs / canvas / Notes
1 Remove canvas member from items?