merge with master
authorPaul Davis <paul@linuxaudiosystems.com>
Wed, 8 May 2013 18:48:28 +0000 (14:48 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Wed, 8 May 2013 18:48:28 +0000 (14:48 -0400)
commitbebe2af95ad9999fdca719450dc2c70cfb849076
tree2bf6f4bae48b72c4607751bf370cbb1f2ce70a15
parente1b0f1bd0b03c071d2b5987e4ab75ef059e32111
parentcadfc2aee13e14af341dd68f33308a421820c855
merge with master
12 files changed:
gtk2_ardour/ardour_ui.h
gtk2_ardour/ardour_window.cc
gtk2_ardour/editor.cc
gtk2_ardour/editor.h
gtk2_ardour/public_editor.h
gtk2_ardour/theme_manager.cc
gtk2_ardour/theme_manager.h
gtk2_ardour/time_axis_view_item.cc
gtk2_ardour/ui_config_vars.h
gtk2_ardour/wscript
libs/gtkmm2ext/utils.cc
wscript