merge (with conflict fixes) with master (even against rgareus' recommendation)
[ardour.git] / gtk2_ardour / audio_time_axis.cc
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 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-12-04 Paul DavisMerge branch 'master' into windows
2013-12-03 Paul DavisMerge branch 'master' into windows
2013-11-30 Paul Davisfix merge with master
2013-11-30 Paul Davismerge and resolve conflict with master
2013-11-27 Paul DavisMerge branch 'master' into cairocanvas
2013-11-27 Paul DavisMerge branch 'master' into windows
2013-11-27 Paul DavisMerge branch 'master' into windows
2013-11-26 Paul DavisMerge branch 'master' into windows
2013-11-26 Paul Davisresolve merge with master (?)
2013-11-25 Paul DavisMerge branch 'master' into cairocanvas
2013-11-04 Paul DavisMerge branch 'master' into cairocanvas
2013-10-31 Paul Davisfix merge with master
2013-10-23 Paul Davisfix merge conflicts 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-17 Paul DavisMerge branch 'master' into windows
2013-10-16 John EmmasMerge remote-tracking branch 'remotes/origin/master...
2013-10-15 John EmmasMerge branch 'windows' into windows+cc
2013-10-15 Paul DavisMerge branch 'master' into windows
2013-10-14 John EmmasMerge branch 'master' into windows+cc
2013-10-11 John EmmasMerge branch 'windows' into windows+cc
2013-10-09 Paul DavisMerge ... master, fixing conflicts in 3 wscript files
2013-10-06 John EmmasMerge branch 'master' into windows+cc
2013-10-03 John Emmas'gtk2_ardour' - Use 'const_iterator' where appropriate...
2013-09-25 John EmmasMerge branch 'cairocanvas' 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-18 Paul DavisMerge branch 'master' into windows
2013-09-17 Paul DavisMerge branch 'master' into cairocanvas
2013-09-17 Paul Davisfix conflicts and merge with master
2013-09-14 Paul DavisMerge branch 'master' into cairocanvas
2013-09-14 Paul Davisfix merge conflicts with master
2013-09-14 Paul DavisMerge branch 'master' into windows
2013-09-14 Paul DavisMerge branch 'master' into windows
2013-09-13 Paul DavisMerge branch 'master' into windows
2013-09-13 Paul DavisMerge branch 'master' into windows
2013-09-12 Paul Davismerge with master
2013-09-12 Paul Davisincomplete merge of master into windows (requires upcom...
2013-09-06 Paul DavisMerge branch 'master' into windows
2013-09-03 Paul DavisMerge branch 'master' into windows
2013-09-03 Paul DavisMerge branch 'master' into windows
2013-08-24 Paul Davisfix merge conflicts from master
2013-08-14 Paul DavisMerge branch 'master' into cairocanvas
2013-08-10 Robin GareusMerge branch 'master' into ccmerge
2013-08-02 Paul DavisMerge branch 'master' into windows
2013-08-01 Paul DavisMerge branch 'master' into windows
2013-08-01 Paul DavisMerge branch 'master' into windows
2013-08-01 Paul Davisfix merge conflict from master
2013-07-17 Paul DavisMerge branch 'master' into windows
2013-07-14 Paul DavisMerge branch 'master' into windows
2013-07-11 Paul DavisFix ambiguous type CheckMenuItem that is also defined...
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-04 Paul Davisinitial commit of hand merging, plus getting "ancient...
2012-09-15 Carl HetheringtonCheck for panner_shell rather than panner before
2012-05-24 David RobillardRemove over 500 unnecessary includes (including 54...
2012-05-22 Paul Davisremove, convert, comment several cerr statements
2012-04-16 Carl HetheringtonFairly major change to the way in which crossfades...
2011-12-27 Carl HetheringtonRe-work layering in possibly debatable ways. Sketchy...
2011-11-19 Carl HetheringtonFix mute display on session load (#4480).
2011-11-02 Paul Davissolo buttons are now ArdourButtons
2011-11-02 Paul Davismute and send-alert buttons are now ArdourButtons
2011-07-11 Paul Davisfix crashing bug where pan_tracks.front() was used...
2011-07-07 Paul Davisintroduce GUIObjectState; massive, pervasive changes...
2011-06-11 Paul Davismajor, substantive reworking of how we store GUI inform...
2011-06-01 David RobillardDelete trailing whitespace
2011-03-07 Carl HetheringtonMake Active apply to the selection.
2011-03-07 Carl HetheringtonMake stuff in the automation menu apply to the track...
2011-03-03 Paul Davisdeframe audio regions as well as MIDI when entering...
2011-02-23 Carl HetheringtonMake hide/show all crossfades apply to the selection.
next