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)
1  2 
gtk2_ardour/ardour_ui.cc

Simple merge