Merge branch 'master' into cairocanvas
authorPaul Davis <paul@linuxaudiosystems.com>
Thu, 5 Dec 2013 22:50:28 +0000 (17:50 -0500)
committerPaul Davis <paul@linuxaudiosystems.com>
Thu, 5 Dec 2013 22:50:28 +0000 (17:50 -0500)
1  2 
gtk2_ardour/ardour_ui.cc
libs/backends/jack/jack_audiobackend.cc

Simple merge