merge with master, primarily for adrian's maximise-mixer change
authorPaul Davis <paul@linuxaudiosystems.com>
Sat, 22 Mar 2014 14:58:26 +0000 (10:58 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Sat, 22 Mar 2014 14:58:26 +0000 (10:58 -0400)
commit86343b6c15a3a43f082802484d2bc813d34db821
tree435370eef5ac082c554570bf9e23887d1d018892
parentae7f56d89f6a4b571788de2948c102cb268f10e9
parentc0845bed53096d60a48072bbc0e63311ec5b4904
Merge ... master, primarily for adrian's maximise-mixer change
gtk2_ardour/ardour_ui.h
gtk2_ardour/ardour_ui_dialogs.cc