Merge branch 'master' into windows
authorPaul Davis <paul@linuxaudiosystems.com>
Sun, 14 Jul 2013 12:27:22 +0000 (08:27 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Sun, 14 Jul 2013 12:27:22 +0000 (08:27 -0400)
commit0aac62e013e15e380001dafae39d554f8765a4a1
tree1d205e81e4f00f25e8f4ddc522642ded3478706a
parent394f2b3ca71ca324fe89fab7c1caae1bd55a9143
parent2106a12edd6dcdf1189b7cfd68b07a0761d77c46
Merge branch 'master' into windows
gtk2_ardour/ardour_ui.cc
gtk2_ardour/generic_pluginui.cc