Merge branch 'master' into cairocanvas
authorPaul Davis <paul@linuxaudiosystems.com>
Wed, 8 Jan 2014 02:37:48 +0000 (21:37 -0500)
committerPaul Davis <paul@linuxaudiosystems.com>
Wed, 8 Jan 2014 02:37:48 +0000 (21:37 -0500)
commit36c233fe6ce570ce85224626ce7aba4a2607537f
treee8c1f9f02766cf5f7ea10487967be2c17f49e906
parentc235d3da994aba4febd644afa09bd5c836c050d5
parent382eb0fc6842f202901245709534477b90bda461
Merge branch 'master' into cairocanvas
gtk2_ardour/ardour3_ui_default.conf
gtk2_ardour/editor_mixer.cc
libs/ardour/wscript
libs/backends/jack/jack_audiobackend.cc
libs/gtkmm2ext/gtkmm2ext/dndvbox.h
wscript