Merge branch 'master' into windows
authorPaul Davis <paul@linuxaudiosystems.com>
Wed, 18 Sep 2013 01:22:56 +0000 (21:22 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Wed, 18 Sep 2013 01:22:56 +0000 (21:22 -0400)
commit302b08c0592a6b7c40dec8c04f52c346e14b17af
treefd4a8d9d661988c330bdfba492456bea63d0c669
parentfb45fdc052b23f4b2210c71a03a14bdb5986098a
parent402d92889a358949af3ea7ad0dd5be88a5652626
Merge branch 'master' into windows
gtk2_ardour/ardour_ui.cc
gtk2_ardour/ardour_ui.h
libs/ardour/audioengine.cc