fix conflicts caused by meterbridge merge
authorPaul Davis <paul@linuxaudiosystems.com>
Thu, 11 Jul 2013 13:11:53 +0000 (09:11 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Thu, 11 Jul 2013 13:11:53 +0000 (09:11 -0400)
commit580520b12f90251e38d94a1a5d6a199b76142b0b
treea20b79ac88794d4d92b88569e643ff67b515d6c3
parent0947791a800aa20ee0ea6a0334c789ab7a34fa90
parentb649f0a21b711c68cba5e26945650fd36f657268
fix conflicts caused by meterbridge merge
gtk2_ardour/ardour3_ui_default.conf
gtk2_ardour/ardour_ui.cc
gtk2_ardour/ardour_ui.h
gtk2_ardour/gain_meter.cc
gtk2_ardour/level_meter.cc
gtk2_ardour/rc_option_editor.cc
gtk2_ardour/route_time_axis.cc
gtk2_ardour/time_axis_view.cc
gtk2_ardour/wscript
libs/ardour/ardour/rc_configuration_vars.h
libs/ardour/wscript