Merge remote-tracking branch 'origin/master' into export-dialog
authorColin Fletcher <colin.m.fletcher@googlemail.com>
Sat, 25 Jan 2014 02:30:55 +0000 (02:30 +0000)
committerColin Fletcher <colin.m.fletcher@googlemail.com>
Sat, 25 Jan 2014 02:30:55 +0000 (02:30 +0000)
commita643c9fdc08f98c7750a2474004a75e143077be9
tree6dedee667d1b91ebd43a8db041985508898b61df
parentd23135f36bd35066f1ed6769ede2002e33a1bf66
parent40d8c5ae01f25e02457c554170a53d537246a7d4
Merge remote-tracking branch 'origin/master' into export-dialog
gtk2_ardour/ardour_ui.cc
libs/ardour/wscript