Merge remote-tracking branch 'origin/master' into export-dialog
authorColin Fletcher <colin.m.fletcher@googlemail.com>
Wed, 8 Jan 2014 15:14:35 +0000 (15:14 +0000)
committerColin Fletcher <colin.m.fletcher@googlemail.com>
Wed, 8 Jan 2014 15:50:34 +0000 (15:50 +0000)
commit52003be3695ab703b936163d7284e208790d5363
tree6804ad19b3ca6afb9edf84ae63307467ad5da384
parentcac644270a8626904a4a21f527cdcf5083defa60
parent382eb0fc6842f202901245709534477b90bda461
Merge remote-tracking branch 'origin/master' into export-dialog

Fix conflicts in:
gtk2_ardour/export_dialog.cc
gtk2_ardour/export_dialog.h
libs/ardour/export_handler.cc
gtk2_ardour/ardour_ui.cc
gtk2_ardour/export_dialog.cc
gtk2_ardour/export_dialog.h
gtk2_ardour/export_format_dialog.cc
gtk2_ardour/wscript
libs/ardour/export_handler.cc
libs/ardour/wscript