merge with master, with minor conflict fixes
[ardour.git] / gtk2_ardour / ui_config.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-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-11 Paul Davisfix merge with master
2014-01-10 Paul Davisfinished merge of cairocanvas with windows and windows...
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-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-21 Paul Davisproperly restore newer (cairo-canvas related) UI config...
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-17 Paul Davischange UIConfig to use accessor/setter methods like...
2011-10-26 Paul Davisnew ArdourButton class, to start to provide more contro...
2009-10-15 Paul Davisrework Stateful::set_state() patch to avoid default...
2009-10-15 Carl HetheringtonPart 1 of loading 2.X sessions; some things work, some...
2009-10-14 David RobillardStrip trailing whitespace and fix other whitespace...
2009-05-14 Carl HetheringtonFirst stage of options rework.
2009-02-25 David Robillard*** NEW CODING POLICY ***
2008-02-02 David RobillardMerge with trunk R2978.
2007-06-29 Doug McLainfix compiler warning
2007-06-29 Doug McLainMoved canvas colors and theme file selection into new...