Merge branch 'master' into cairocanvas
authorPaul Davis <paul@linuxaudiosystems.com>
Wed, 18 Sep 2013 01:23:30 +0000 (21:23 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Wed, 18 Sep 2013 01:23:30 +0000 (21:23 -0400)
commitfd23ebd0886cd61f8ee68d52d6576d00a16c9032
tree3266dfd8b1deefc1b8ec60f0c9098d99ecac966c
parent5e0e41e068a04603198a4e50464d794156f42c47
parent402d92889a358949af3ea7ad0dd5be88a5652626
Merge branch 'master' into cairocanvas
gtk2_ardour/ardour_ui.cc
gtk2_ardour/ardour_ui.h
gtk2_ardour/editor.cc