merge (with conflict fixes) with master (even against rgareus' recommendation)
[ardour.git] / libs / ardour / test / resampled_source_test.h
2011-12-09 Carl HetheringtonAdd simple framewalk_to_beats test and normalise naming