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)
1  2 
gtk2_ardour/ardour_ui.h
gtk2_ardour/ardour_ui_dialogs.cc

Simple merge
Simple merge