Merge branch 'master' into export-dialog
authorColin Fletcher <colin.m.fletcher@googlemail.com>
Mon, 24 Feb 2014 18:11:48 +0000 (18:11 +0000)
committerColin Fletcher <colin.m.fletcher@googlemail.com>
Mon, 24 Feb 2014 18:11:48 +0000 (18:11 +0000)
commit57077093b706c5938f9fd70f70d031cae2c59217
treea4adfba29ac589479ad1b3a5888d6e6cf0ba9c60
parenta643c9fdc08f98c7750a2474004a75e143077be9
parentce4d125d1fd91bb3cdf82319dcce53abb35afcca
Merge branch 'master' into export-dialog
gtk2_ardour/ardour_ui.cc