fix merge with master
[ardour.git] / libs / ardour / engine_slave.cc
2013-10-22 Paul Davismerge from master
2013-10-22 Paul DavisMerge branch 'unify_display_ordering' of https://github...
2013-10-22 Paul DavisMerge branch 'miscfix' of https://github.com/mojofunk...
2013-10-21 Paul Davisfix issues with recording while synced to JACK (non...
2013-10-17 Paul Davismerge with master and fix 2 conflicts
2013-09-20 Paul DavisMerge branch 'master' of https://github.com/nmains...
2013-09-19 Paul Davisswitch from JACK_Slave to Engine_Slave