Colin Fletcher
5399425f53
Merge branch 'export-dialog' into cairocanvas
Fix merge conflicts in:
gtk2_ardour/export_range_markers_dialog.cc
gtk2_ardour/wscript
libs/ardour/ardour/export_handler.h
libs/ardour/system_exec.cc
libs/pbd/pbd/system_exec.h
libs/pbd/system_exec.cc
2014-05-19 20:54:36 +01:00
..
2014-01-17 13:19:42 -05:00
2014-05-19 20:54:36 +01:00
2014-04-28 21:18:02 -04:00
2014-05-16 18:19:41 +02:00
2014-05-07 10:35:50 -04:00
2014-04-28 21:11:08 -04:00
2014-04-28 21:18:02 -04:00
2014-05-17 16:54:12 +02:00
2014-05-16 18:34:59 +02:00
2014-04-08 09:49:35 +01:00
2014-04-30 10:10:06 -04:00
2014-04-28 21:11:08 -04:00
2014-05-19 20:54:36 +01:00
2014-03-04 15:25:58 +01:00
2014-04-28 21:18:02 -04:00
2014-05-16 19:58:46 +02:00
2014-04-08 09:49:35 +01:00
2014-04-28 21:11:08 -04:00
2014-04-28 21:11:08 -04:00