merge from master
authorPaul Davis <paul@linuxaudiosystems.com>
Tue, 22 Oct 2013 19:29:44 +0000 (15:29 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Tue, 22 Oct 2013 19:29:44 +0000 (15:29 -0400)
commit664e715a002450ac0f079411f6f051c122a4322a
tree762f2a060843f77504ff39e2257ed4f32e6f83a1
parentf86599cd74197ceb3e2e5cfe80a9a2dd5ee4201a
parent61e66bb7631fc070a629d83e91855f58d7fb2489
merge from master
gtk2_ardour/ardour_ui.cc
gtk2_ardour/ardour_ui.h
gtk2_ardour/editor_drag.cc
gtk2_ardour/editor_ops.cc
gtk2_ardour/editor_routes.cc
gtk2_ardour/editor_selection.cc
gtk2_ardour/generic_pluginui.cc
gtk2_ardour/rc_option_editor.cc
libs/ardour/ardour/rc_configuration_vars.h
libs/ardour/wscript
wscript