merge with master and fix 4 conflicts by hand
[ardour.git] / gtk2_ardour / icons / fadeout-fast-cut.png
gtk2_ardour/icons/fadeout-fast-cut.png