fix merge conflict from master
[ardour.git] / libs / ardour / audiofilesource.cc
2006-07-05 David RobillardMerged with trunk, and a few trivial GUI updates etc.
2006-06-29 Hans Fugalmerging trunk
2006-06-28 Paul Davismany fixes to audio file code, SMPTE offset now works...
2006-06-27 Taybin RutkinCoreAudioSource moved to coreaudiosource.cc.
2006-06-26 David RobillardLarge nasty commit in the form of a 5000 line patch...
2006-06-22 Hans FugalMerging from trunk
2006-06-21 Paul Davisthe return of VST support
2006-06-15 David RobillardMerged with trunk revision 600
2006-06-14 Paul Davismore file add/remove ops related to sndfile changes