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)
commit59da788793186d90c30b10654bcfd4d20a7d6eb3
treeab1b82d373274b007c4acad248bcf4a8ea7b8f1c
parentc3c9960427d4152668cb01b84da374512bc24e0e
parentce7bfb489cc6f7522704f935ded4b4c438dc1c1e
Merge branch 'master' into cairocanvas
gtk2_ardour/ardour_ui.cc
libs/backends/jack/jack_audiobackend.cc