fix merge conflicts with master
[ardour.git] / gtk2_ardour / hit.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-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-05 Paul Davismaster merge; new files not added after initial cairoca...