merge with master, including manual merge conflict resolution
[ardour.git] / gtk2_ardour / note.h
2013-04-06 Paul DavisMerge ... master, including manual merge conflict resol...
2013-04-06 Paul DavisMerge branch 'master' into cairocanvas
2013-04-04 Paul Davisinitial commit of hand merging, plus getting "ancient...