Merge branch 'master' into windows
authorPaul Davis <paul@linuxaudiosystems.com>
Thu, 17 Oct 2013 01:57:17 +0000 (21:57 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Thu, 17 Oct 2013 01:57:17 +0000 (21:57 -0400)
commitfb313fb1741a04f270fff3703967df572ac4fc45
tree5f5477510365ca0972a2467f660da0507abced3e
parent8ea695c00ab0bdbc6fbb29b33fac6e3dbfcbe9f1
parentda5a49067839ec32a016bf1b66c3808ad7cbf699
Merge branch 'master' into windows
gtk2_ardour/ardour_ui.cc
gtk2_ardour/video_server_dialog.cc
libs/backends/jack/jack_utils.cc
wscript