fix merge conflict with master
[ardour.git] / libs / ardour / ardour / buffer_manager.h
2014-01-23 Paul Davisfix merge conflict with master
2014-01-19 Paul Davisvisibility macros and flush() added to SrcFileSource...
2014-01-17 Paul DavisMerge branch 'master' into cairocanvas
2014-01-17 Paul DavisMerge branch 'master' into cairocanvas
2014-01-16 Paul DavisMerge branch 'master' into cairocanvas
2014-01-16 Paul DavisMerge branch 'master' into cairocanvas
2014-01-16 Paul DavisMerge branch 'master' into cairocanvas
2014-01-15 Paul DavisMerge branch 'master' into cairocanvas
2014-01-15 Paul Davismerge with master
2014-01-15 Paul Davismerge with master
2014-01-14 Paul Davismerge (with conflict fixes) with master (even against...
2014-01-11 Paul Davisfix merge with master
2014-01-10 Paul Davisfinished merge of cairocanvas with windows and windows...
2014-01-10 Paul Davisfix merge errors with master
2014-01-08 Paul DavisMerge branch 'master' into cairocanvas
2014-01-02 Paul DavisMerge branch 'master' into cairocanvas
2013-12-28 Paul DavisMerge branch 'master' into cairocanvas
2013-12-27 Paul Davismerge exportvis branch into cairocanvas, to reduce...
2013-12-04 Paul DavisMerge branch 'master' into exportvis
2013-12-03 Paul Davisfix up wscript/build issues in exportvis after merge...
2013-10-18 John EmmasMerge remote-tracking branch 'remotes/origin/exportvis...
2013-10-17 Paul Davisadd export visibility macros across libardour
2013-01-16 Paul Davisadd copyright comments
2012-07-25 Paul Davisconvert from Glib:: to Glib::Threads for all thread...
2011-06-01 David RobillardFix broken whitespace. I'd apologize for the compile...
2011-03-26 Paul Davisremove Evoral::RingBuffer, which was (a) duplicating...
2010-06-03 Torben Hohnmerge 3.0P into trunk.
2010-04-22 Carl Hetheringtontorbenh's buffer manager fixes from 3.0P
2010-04-13 Paul Davissubstantive change: use the JACK wait API and provide...