merge with master, with minor conflict fixes
[ardour.git] / gtk2_ardour / time_axis_view.h
2014-02-08 Paul Davismerge with master, with minor conflict fixes
2014-02-04 Paul Davismerge (w/fix) with master
2014-01-30 Paul DavisMerge branch 'master' into cairocanvas
2014-01-29 Paul DavisMerge branch 'master' into cairocanvas
2014-01-23 Paul Davisfix merge conflict with master
2014-01-20 John EmmasMerge branch 'windows+cc' into cairocanvas
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-13 John EmmasMerge branch 'windows+cc' into cairocanvas
2014-01-13 John EmmasMerge branch 'windows+cc' into cairocanvas
2014-01-12 John EmmasMerge branch 'windows+cc' into cairocanvas
2014-01-11 Paul Davisfix merge with master
2014-01-10 Paul Davisfinished merge of cairocanvas with windows and windows...
2014-01-10 Paul DavisMerge windows+cc branch into cairocanvas branch. Not...
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-23 Paul Davisfix redrawing of canvas with an optimized build
2013-12-12 Paul Davisfix merge conflicts from master
2013-12-05 Paul DavisMerge branch 'master' into cairocanvas
2013-11-30 Paul Davisfix merge with master
2013-11-27 Paul DavisMerge branch 'master' into cairocanvas
2013-11-25 Paul DavisMerge branch 'master' into cairocanvas
2013-11-04 Paul DavisMerge branch 'master' into cairocanvas
2013-11-03 Paul Davissend enter events to EVERY newly entered item (ignore...
2013-10-31 Paul Davisfix merge with master
2013-10-22 Paul Davismerge from master
2013-10-18 Paul DavisMerge branch 'master' into cairocanvas
2013-10-18 John EmmasMerge remote-tracking branch 'remotes/origin/exportvis...
2013-10-17 Paul Davismerge with master and fix 2 conflicts
2013-10-16 John EmmasMerge remote-tracking branch 'remotes/origin/master...
2013-10-15 John EmmasMerge branch 'windows' into windows+cc
2013-10-14 John EmmasMerge branch 'master' into windows+cc
2013-10-11 John EmmasMerge branch 'windows' into windows+cc
2013-10-06 John EmmasMerge branch 'master' into windows+cc
2013-09-21 John EmmasMerge remote-tracking branch 'remotes/origin/cairocanva...
2013-09-18 Paul DavisMerge branch 'master' into cairocanvas
2013-09-17 Paul DavisMerge branch 'master' into cairocanvas
2013-09-14 Paul DavisMerge branch 'master' into cairocanvas
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-15 Paul DavisFix dragging objects on the canvas and remove redundant...
2013-04-13 Paul DavisMerge branch 'cairocanvas' of git.ardour.org:ardour...
2013-04-12 Paul Davisremove TimeAxisView::clip_to_viewport() and Editor...
2013-04-12 Paul Davischange frames_per_pixel to samples_per_pixel
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...
2013-01-21 Paul Davisreturn to the old way of editing track names, but hopef...
2013-01-19 Paul Daviscompletely revisit how track name editing works in...
2013-01-14 Paul Davismore substantive reworkings of TimeAxisView::name_...
2013-01-12 Paul Davisvarious tweaks to get 80% Of the way to proper use...
2012-12-27 Paul Davisdo not start editing track/bus names on a single click...
2012-05-27 Carl HetheringtonPatch from tophatdave to improve display of timestretch in
2012-05-07 Paul Davishide xfades while dragging region(s)
2012-04-09 Paul DavisMCP: F1-7 jump to a given view; F8 closes any currently...
2011-12-27 Carl HetheringtonRe-work layering in possibly debatable ways. Sketchy...
2011-12-12 Carl HetheringtonMake TimeAxisView::remove_child virtual so that RouteTi...
2011-11-04 Paul Davisdrastic overhaul of keyboard handling in mixer window...
2011-08-31 David RobillardFix editor track heights (m/s/etc. buttons being cut...
2011-07-11 Carl HetheringtonChange the cursor back from the track resize handle...
2011-07-07 Paul Davisremove track resize handle and allow resize of tracks...
2011-07-07 Paul Davisintroduce GUIObjectState; massive, pervasive changes...
2011-06-11 Paul Davismajor, substantive reworking of how we store GUI inform...
2011-06-02 David RobillardRemove "smaller" track height (basically just a broken...
2011-06-01 David RobillardDelete trailing whitespace
2011-05-04 Carl HetheringtonDon't alter horizontal padding when shrinking tracks...
2011-03-03 Paul Davisexperiment with making MIDI region boxes vanish when...
2011-02-23 Carl HetheringtonMake track context menu height option work for all...
2011-02-17 Carl HetheringtonMake sense of parameter to tav_zoom_step match up with...
2011-02-16 Carl HetheringtonRe-add height menu to tracks (#3761).
2010-12-03 Carl HetheringtonRemove all use of nframes_t.
2010-09-27 Carl HetheringtonFix multiple creation of identical automation tracks...
next