merge with master and fix 4 conflicts by hand
[ardour.git] / libs / ardour / test / framepos_minus_beats_test.h
2011-12-11 Carl HetheringtonKeep track of MIDI region's start positions in beats, to