John Emmas
b855e5f322
Merge remote-tracking branch 'remotes/origin/exportvis' into windows+cc
Conflicts (hopefully resolved):
gtk2_ardour/wscript
libs/ardour/ardour/audioregion.h
libs/ardour/ardour/debug.h
libs/ardour/ardour/directory_names.h
libs/ardour/ardour/filesystem_paths.h
libs/ardour/ardour/session_event.h
libs/gtkmm2ext/gtkmm2ext/utils.h
libs/panners/1in2out/wscript
libs/panners/2in2out/wscript
libs/panners/vbap/wscript
libs/pbd/pbd/debug.h
libs/pbd/pbd/file_utils.h
libs/pbd/pbd/pathexpand.h
libs/pbd/pbd/ringbuffer.h
libs/pbd/pbd/ringbufferNPT.h
libs/pbd/pbd/search_path.h
libs/pbd/pbd/stacktrace.h
libs/pbd/pbd/uuid.h
libs/pbd/pbd/uuid_boost.h
libs/surfaces/control_protocol/control_protocol/basic_ui.h
libs/surfaces/control_protocol/control_protocol/control_protocol.h
2013-10-18 10:03:22 +01:00
..
2008-06-02 21:41:35 +00:00
2013-10-17 10:52:02 -04:00
2013-10-17 10:27:04 -04:00
2009-01-28 04:55:31 +00:00
2013-10-18 10:03:22 +01:00
2013-10-17 09:56:43 -04:00
2013-10-17 15:07:18 -04:00
2013-10-17 10:27:04 -04:00
2013-10-17 10:27:04 -04:00
2013-10-18 10:03:22 +01:00
2013-10-17 10:27:04 -04:00