merge with master
[ardour.git] / gtk2_ardour / video_image_frame.h
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-17 Paul DavisMerge branch 'cairocanvas' of git.ardour.org:ardour...
2013-04-17 Robin Gareusvtl: s/[audio]frame/sample/
2013-04-17 Paul DavisMerge branch 'cairocanvas' of git.ardour.org:ardour...
2013-04-16 Robin Gareusvtl: remove superfluous group
2013-04-16 Robin Gareusvtl: use ArdourImage
2013-04-12 Paul DavisMerge branch 'cairocanvas' of git.ardour.org:ardour...
2013-04-11 Robin GareusMerge branch 'master' into cairocanvas
2013-04-11 Robin Gareusenable videotimeline by default
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 branch 'cairocanvas' of git.ardour.org:ardour...
2013-04-06 Paul DavisMerge ... master, including manual merge conflict resol...
2013-04-06 Paul DavisMerge branch 'master' into cairocanvas
2013-04-06 Robin Gareusvtl: make videotimeline work with new cairo canvas
2013-04-04 Paul Davisinitial commit of hand merging, plus getting "ancient...
2013-03-13 Robin Gareusvideotimline