merge (with conflict fixes) with master (even against rgareus' recommendation)
[ardour.git] / gtk2_ardour / mixer_strip.cc
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 Robin Gareusmisc panning related UI tweaks:
2014-01-13 Robin Gareusadd independent panner for internal (Aux) sends
2014-01-13 Robin Gareusallow to custom select panner-type for each delivery.
2014-01-13 John EmmasMerge branch 'windows+cc' into cairocanvas
2014-01-13 Robin Gareusmisc panning related UI tweaks:
2014-01-13 Robin Gareusadd independent panner for internal (Aux) sends
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 Robin Gareusrework panning -- Squashed commit of the following:
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-22 Robin Gareusadd K12/RMS meter type
2013-12-04 Paul DavisMerge branch 'master' into windows
2013-12-03 Paul DavisMerge branch 'master' into windows
2013-11-30 Paul Davismerge and resolve conflict with master
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-10-23 Paul Davisfix merge conflicts with master
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 Paul DavisMerge branch 'master' into windows
2013-10-14 John EmmasMerge branch 'master' 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-09-25 John EmmasMerge branch 'cairocanvas' into windows+cc
2013-09-21 John EmmasMerge remote-tracking branch 'remotes/origin/cairocanva...
2013-09-20 Paul DavisMerge branch 'master' of https://github.com/nmains...
2013-09-18 Paul Davismore excision of "JACK" from labels, menu items, etc.
2013-09-18 Paul DavisMerge branch 'master' into windows
2013-09-17 Paul Davisfix conflicts and merge 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-08 Robin Gareusrestore session backwards compatibility to 3.3
2013-08-08 Robin Gareusimplement new meter types
2013-08-08 Robin GareusRevert "Revert new meter types (postponed until after...
2013-08-08 Robin GareusRevert new meter types (postponed until after 3.3 release)
2013-08-08 Robin Gareusadd VU and IEC meter DSP (from jmeters)
2013-08-08 Robin Gareussimplify meter-type context menu
2013-08-08 Robin Gareusmove ardour meter globals into dedicated namespace...
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-22 Robin Gareusrestore session backwards compatibility to 3.3
2013-07-22 Robin Gareusimplement new meter types
2013-07-22 Robin GareusRevert "Revert new meter types (postponed until after...
2013-07-17 John EmmasMerge branch 'windows' of git.ardour.org:ardour/ardour...
2013-07-17 Paul DavisMerge branch 'master' into windows
2013-07-15 Paul DavisMerge branch 'apple' of https://github.com/mfisher31...
2013-07-15 Robin GareusRevert new meter types (postponed until after 3.3 release)
2013-07-15 Robin Gareusadd VU and IEC meter DSP (from jmeters)
2013-07-15 Robin Gareussimplify meter-type context menu
2013-07-15 Robin Gareusmove ardour meter globals into dedicated namespace...
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-11 Robin Gareusamend cb7bcb6d - locked-solo button style
2013-07-10 Robin Gareusreplace Lock^Wshopping-bag icon with button-sensitivity
2013-07-10 Robin Gareusupdate mixer-meter (width) and panner if channel count...
2013-07-10 Robin Gareussave width of mixer-strip when changing _all_ strips
2013-07-10 Robin Gareusslimming diet for the narrow-mixer strip
2013-07-10 Robin GareusRevert "show track-ID in mixer" and "...towards unique...
2013-07-10 Robin Gareusshow track-ID in mixer
2013-07-10 Robin Gareusadd convenience functions to switch meter-types.. ...
2013-07-10 Robin Gareuswith RMS meters: use "peak indicator" as DPM
2013-07-10 Robin Gareusignore state-changes during [meter] context-menu popup...
2013-07-10 Robin Gareusshare meter-type among meter instances.
2013-07-10 Robin Gareusremember meter type with session
2013-06-26 Paul DavisMerge branch 'master' into cairocanvas
2013-06-23 Robin GareusMerge branch 'radiosrb' of https://github.com/adiknoth...
2013-06-23 Robin GareusMerge branch 'patches' of https://github.com/jdekozak...
2013-06-23 Robin Gareusfix caching of Audio+Midi metrics
2013-05-03 Paul Davismerge resolution with master
2013-05-02 Paul Davisremove all of Gtk::Window::set_position (WIN_POS_MOUSE...
2013-03-07 Paul Davisfix problem with display of panner when adding instrume...
2013-01-24 Paul Davisfix labels and time-of-labelling for iso+lock buttons...
2013-01-21 Paul Davismore cleanup of crazy (?) stuff regarding gain display...
2013-01-21 Paul Davisfix/revert/modify changes from 13617 that hide the...
2013-01-12 Robin Gareusnarrow-mixer strip tweak:
2013-01-08 Paul Davistentative redesign of MIDI looping, will probably fix...
2012-12-07 Ben Loftiscrash fix. looks like narrow mixer strips need more...
2012-12-07 Ben Loftismore theming and layout tweaks. new faders that pre...
2012-12-06 Ben Loftisseveral theme changes. changed drawing of rounded_rect...
next