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
..
control_protocol	Merge remote-tracking branch 'remotes/origin/exportvis' into windows+cc	2013-10-18 10:03:22 +01:00
frontier	Merge remote-tracking branch 'remotes/origin/exportvis' into windows+cc	2013-10-18 10:03:22 +01:00
generic_midi	Merge remote-tracking branch 'remotes/origin/exportvis' into windows+cc	2013-10-18 10:03:22 +01:00
mackie	Merge remote-tracking branch 'remotes/origin/exportvis' into windows+cc	2013-10-18 10:03:22 +01:00
osc	Merge remote-tracking branch 'remotes/origin/exportvis' into windows+cc	2013-10-18 10:03:22 +01:00
tranzport	Merge remote-tracking branch 'remotes/origin/exportvis' into windows+cc	2013-10-18 10:03:22 +01:00
wiimote	Merge remote-tracking branch 'remotes/origin/exportvis' into windows+cc	2013-10-18 10:03:22 +01:00
wscript	fix conflicts and merge with master	2013-09-16 22:11:06 -04:00