fix merge conflicts from master
authorPaul Davis <paul@linuxaudiosystems.com>
Thu, 12 Dec 2013 15:06:59 +0000 (10:06 -0500)
committerPaul Davis <paul@linuxaudiosystems.com>
Thu, 12 Dec 2013 15:06:59 +0000 (10:06 -0500)
commit1676789907b95aa8d5bf6cc2ce62aa66a80b9aae
tree7c84f3eb9a4d400a26f29461d40bd50ba32ae8d4
parent88732abd0177f9ee9f4be780e3ffe724ef798c64
parentfd1eb73ef21e8a938e34ca49378a866c381c48e3
fix merge conflicts from master
gtk2_ardour/gtk_pianokeyboard.c
libs/ardour/export_channel.cc
libs/backends/jack/jack_audiobackend.cc
wscript