main.carlh.net Git - ardour.git/commit

author	John Emmas <johne53@tiscali.co.uk>
	Fri, 18 Oct 2013 09:03:22 +0000 (10:03 +0100)
committer	John Emmas <johne53@tiscali.co.uk>
	Fri, 18 Oct 2013 09:03:22 +0000 (10:03 +0100)
commit	b855e5f3220027502a3c88f189d511fe2a5a3c2b
tree	b106fabe68c471cb95688e151e8466dac3e0ea4c	tree \| snapshot
parent	75b933eadbe8f90a73a29bb207ff26eebcd4121a	commit \| diff
parent	5ba369918b07a4c0859f0e94537da7b5a11bb49f	commit \| diff

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

70 files changed:

gtk2_ardour/wscript	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/async_midi_port.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/audiofile_tagger.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/audiofilesource.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/audioplaylist.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/audioregion.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/butler.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/chan_count.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/coreaudiosource.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/export_profile_manager.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/file_source.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/interthread_info.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/ladspa_plugin.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/lv2_plugin.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/midi_playlist.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/midi_track.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/panner.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/panner_manager.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/playlist.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/plugin_manager.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/region.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/session.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/silentfilesource.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/sndfilesource.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/find_session.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/wscript	diff1 \|	diff2 \|	blob \| history
libs/audiographer/audiographer/broadcast_info.h	diff1 \|	diff2 \|	blob \| history
libs/audiographer/audiographer/debug_utils.h	diff1 \|	diff2 \|	blob \| history
libs/backends/jack/wscript	diff1 \|	diff2 \|	blob \| history
libs/evoral/evoral/Sequence.hpp	diff1 \|	diff2 \|	blob \| history
libs/evoral/evoral/midi_util.h	diff1 \|	diff2 \|	blob \| history
libs/gtkmm2ext/gtk_ui.cc	diff1 \|	diff2 \|	blob \| history
libs/gtkmm2ext/gtkmm2ext/auto_spin.h	diff1 \|	diff2 \|	blob \| history
libs/gtkmm2ext/gtkmm2ext/click_box.h	diff1 \|	diff2 \|	blob \| history
libs/gtkmm2ext/gtkmm2ext/doi.h	diff1 \|	diff2 \|	blob \| history
libs/gtkmm2ext/gtkmm2ext/gtk_ui.h	diff1 \|	diff2 \|	blob \| history
libs/gtkmm2ext/gtkmm2ext/popup.h	diff1 \|	diff2 \|	blob \| history
libs/gtkmm2ext/gtkmm2ext/selector.h	diff1 \|	diff2 \|	blob \| history
libs/gtkmm2ext/gtkmm2ext/slider_controller.h	diff1 \|	diff2 \|	blob \| history
libs/gtkmm2ext/gtkmm2ext/utils.h	diff1 \|	diff2 \|	blob \| history
libs/midi++2/midi++/ipmidi_port.h	diff1 \|	diff2 \|	blob \| history
libs/midi++2/midi++/port.h	diff1 \|	diff2 \|	blob \| history
libs/panners/1in2out/wscript	diff1 \|	diff2 \|	blob \| history
libs/panners/2in2out/wscript	diff1 \|	diff2 \|	blob \| history
libs/panners/vbap/wscript	diff1 \|	diff2 \|	blob \| history
libs/pbd/pbd/abstract_ui.h	diff1 \|	diff2 \|	blob \| history
libs/pbd/pbd/base_ui.h	diff1 \|	diff2 \|	blob \| history
libs/pbd/pbd/debug.h	diff1 \|	diff2 \|	blob \| history
libs/pbd/pbd/file_utils.h	diff1 \|	diff2 \|	blob \| history
libs/pbd/pbd/floating.h	diff1 \|	diff2 \|	blob \| history
libs/pbd/pbd/pathscanner.h	diff1 \|	diff2 \|	blob \| history
libs/pbd/pbd/pthread_utils.h	diff1 \|	diff2 \|	blob \| history
libs/pbd/pbd/ringbuffer.h	diff1 \|	diff2 \|	blob \| history
libs/pbd/pbd/ringbufferNPT.h	diff1 \|	diff2 \|	blob \| history
libs/pbd/pbd/search_path.h	diff1 \|	diff2 \|	blob \| history
libs/pbd/pbd/semaphore.h	diff1 \|	diff2 \|	blob \| history
libs/pbd/pbd/semutils.h	diff1 \|	diff2 \|	blob \| history
libs/pbd/pbd/sequence_property.h	diff1 \|	diff2 \|	blob \| history
libs/pbd/pbd/signals.h	diff1 \|	diff2 \|	blob \| history
libs/pbd/pbd/stacktrace.h	diff1 \|	diff2 \|	blob \| history
libs/pbd/pbd/undo.h	diff1 \|	diff2 \|	blob \| history
libs/pbd/pbd/uuid.h	diff1 \|	diff2 \|	blob \| history
libs/pbd/wscript	diff1 \|	diff2 \|	blob \| history
libs/surfaces/control_protocol/control_protocol/control_protocol.h	diff1 \|	diff2 \|	blob \| history
libs/surfaces/control_protocol/wscript	diff1 \|	diff2 \|	blob \| history
libs/surfaces/generic_midi/wscript	diff1 \|	diff2 \|	blob \| history
libs/surfaces/mackie/wscript	diff1 \|	diff2 \|	blob \| history
libs/surfaces/osc/wscript	diff1 \|	diff2 \|	blob \| history
libs/surfaces/tranzport/wscript	diff1 \|	diff2 \|	blob \| history
libs/surfaces/wiimote/wscript	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

gtk2_ardour/wscript	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/async_midi_port.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/audiofile_tagger.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/audiofilesource.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/audioplaylist.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/audioregion.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/butler.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/chan_count.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/coreaudiosource.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/export_profile_manager.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/file_source.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/interthread_info.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/ladspa_plugin.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/lv2_plugin.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/midi_playlist.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/midi_track.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/panner.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/panner_manager.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/playlist.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/plugin_manager.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/region.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/session.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/silentfilesource.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/sndfilesource.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/find_session.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/wscript	diff1 \|	diff2 \|	blob \| history
libs/audiographer/audiographer/broadcast_info.h	diff1 \|	diff2 \|	blob \| history
libs/audiographer/audiographer/debug_utils.h	diff1 \|	diff2 \|	blob \| history
libs/backends/jack/wscript	diff1 \|	diff2 \|	blob \| history
libs/evoral/evoral/Sequence.hpp	diff1 \|	diff2 \|	blob \| history
libs/evoral/evoral/midi_util.h	diff1 \|	diff2 \|	blob \| history
libs/gtkmm2ext/gtk_ui.cc	diff1 \|	diff2 \|	blob \| history
libs/gtkmm2ext/gtkmm2ext/auto_spin.h	diff1 \|	diff2 \|	blob \| history
libs/gtkmm2ext/gtkmm2ext/click_box.h	diff1 \|	diff2 \|	blob \| history
libs/gtkmm2ext/gtkmm2ext/doi.h	diff1 \|	diff2 \|	blob \| history
libs/gtkmm2ext/gtkmm2ext/gtk_ui.h	diff1 \|	diff2 \|	blob \| history
libs/gtkmm2ext/gtkmm2ext/popup.h	diff1 \|	diff2 \|	blob \| history
libs/gtkmm2ext/gtkmm2ext/selector.h	diff1 \|	diff2 \|	blob \| history
libs/gtkmm2ext/gtkmm2ext/slider_controller.h	diff1 \|	diff2 \|	blob \| history
libs/gtkmm2ext/gtkmm2ext/utils.h	diff1 \|	diff2 \|	blob \| history
libs/midi++2/midi++/ipmidi_port.h	diff1 \|	diff2 \|	blob \| history
libs/midi++2/midi++/port.h	diff1 \|	diff2 \|	blob \| history
libs/panners/1in2out/wscript	diff1 \|	diff2 \|	blob \| history
libs/panners/2in2out/wscript	diff1 \|	diff2 \|	blob \| history
libs/panners/vbap/wscript	diff1 \|	diff2 \|	blob \| history
libs/pbd/pbd/abstract_ui.h	diff1 \|	diff2 \|	blob \| history
libs/pbd/pbd/base_ui.h	diff1 \|	diff2 \|	blob \| history
libs/pbd/pbd/debug.h	diff1 \|	diff2 \|	blob \| history
libs/pbd/pbd/file_utils.h	diff1 \|	diff2 \|	blob \| history
libs/pbd/pbd/floating.h	diff1 \|	diff2 \|	blob \| history
libs/pbd/pbd/pathscanner.h	diff1 \|	diff2 \|	blob \| history
libs/pbd/pbd/pthread_utils.h	diff1 \|	diff2 \|	blob \| history
libs/pbd/pbd/ringbuffer.h	diff1 \|	diff2 \|	blob \| history
libs/pbd/pbd/ringbufferNPT.h	diff1 \|	diff2 \|	blob \| history
libs/pbd/pbd/search_path.h	diff1 \|	diff2 \|	blob \| history
libs/pbd/pbd/semaphore.h	diff1 \|	diff2 \|	blob \| history
libs/pbd/pbd/semutils.h	diff1 \|	diff2 \|	blob \| history
libs/pbd/pbd/sequence_property.h	diff1 \|	diff2 \|	blob \| history
libs/pbd/pbd/signals.h	diff1 \|	diff2 \|	blob \| history
libs/pbd/pbd/stacktrace.h	diff1 \|	diff2 \|	blob \| history
libs/pbd/pbd/undo.h	diff1 \|	diff2 \|	blob \| history
libs/pbd/pbd/uuid.h	diff1 \|	diff2 \|	blob \| history
libs/pbd/wscript	diff1 \|	diff2 \|	blob \| history
libs/surfaces/control_protocol/control_protocol/control_protocol.h	diff1 \|	diff2 \|	blob \| history
libs/surfaces/control_protocol/wscript	diff1 \|	diff2 \|	blob \| history
libs/surfaces/generic_midi/wscript	diff1 \|	diff2 \|	blob \| history
libs/surfaces/mackie/wscript	diff1 \|	diff2 \|	blob \| history
libs/surfaces/osc/wscript	diff1 \|	diff2 \|	blob \| history
libs/surfaces/tranzport/wscript	diff1 \|	diff2 \|	blob \| history
libs/surfaces/wiimote/wscript	diff1 \|	diff2 \|	blob \| history