fix merge conflicts with master
[ardour.git] / gtk2_ardour / tempo_lines.h
2013-09-14 Paul Davisfix merge conflicts with master
2013-08-14 Paul DavisMerge branch 'master' into cairocanvas
2013-08-10 Robin GareusMerge branch 'master' into ccmerge
2013-07-11 Paul Davisfix conflicts caused by meterbridge merge
2013-07-09 Paul DavisMerge branch 'master' into cairocanvas
2013-07-01 Paul DavisMerge branch 'master' into cairocanvas
2013-06-26 Paul DavisMerge branch 'master' into cairocanvas
2013-06-14 Robin GareusMerge branch 'master' into cairocanvas
2013-06-14 Paul Davismerge with master
2013-06-07 Paul DavisMerge branch 'master' into cairocanvas
2013-06-06 Paul DavisMerge branch 'master' into cairocanvas
2013-05-08 Paul Davismerge with master
2013-05-05 Paul Davismerge with master
2013-05-03 Paul Davismerge resolution with master
2013-04-26 Paul DavisMerge branch 'master' into cairocanvas
2013-04-21 Paul Davisremove probably premature-or-no-longer-necessary optimi...
2013-04-21 Paul DavisRevert "add Group::clear(), do not clear _canvas member...
2013-04-21 Paul Davisadd Group::clear(), do not clear _canvas member of...
2013-04-17 Paul DavisMerge branch 'cairocanvas' of git.ardour.org:ardour...
2013-04-17 Paul Davisfix clamping of line and rect coordinates to avoid...
2013-04-11 Robin GareusMerge branch 'master' into cairocanvas
2013-04-10 Paul DavisMerge branch 'master' into cairocanvas
2013-04-09 Paul DavisMerge branch 'master' into cairocanvas
2013-04-06 Paul DavisMerge branch 'master' into cairocanvas
2013-04-06 Paul DavisMerge ... master, including manual merge conflict resol...
2013-04-06 Paul DavisMerge branch 'master' into cairocanvas
2013-04-04 Paul Davisinitial commit of hand merging, plus getting "ancient...
2012-01-03 Paul Davisreturn two iterators into the Bars|Beats list of the...
2009-10-14 David RobillardStrip trailing whitespace and fix other whitespace...
2009-02-25 David Robillard*** NEW CODING POLICY ***
2008-12-30 Sakari BergenFix more compiling/linking errors on OS X
2008-10-14 Nick MainsbridgeMake tempo lines physical_screen_height high, add xml...
2008-09-23 David RobillardAn actual tempo line cache (not quite perfect when...
2007-08-05 David RobillardPulled tempo line stuff out into it's own relatively...