merge with master, including manual merge conflict resolution
[ardour.git] / libs / canvas / Notes
1 Remove canvas member from items?