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

author	Paul Davis <paul@linuxaudiosystems.com>
	Thu, 12 Sep 2013 15:28:50 +0000 (11:28 -0400)
committer	Paul Davis <paul@linuxaudiosystems.com>
	Thu, 12 Sep 2013 15:28:50 +0000 (11:28 -0400)
commit	bb826f4beebfcedc50570b818c305560d2233e47
tree	1484460f914e64fdbdce58230ffe7934bc0761f4	tree \| snapshot
parent	8c5cff60912c7e0a7256f635641399500d8d00d9	commit \| diff
parent	f85b362351a5f9167f93b6988f2c8a4c7e03a33c	commit \| diff

incomplete merge of master into windows (requires upcoming changes to master to be complete)

54 files changed:

gtk2_ardour/ardour_ui.cc	diff1 \|	diff2 \|	blob \| history
gtk2_ardour/ardour_ui.h	diff1 \|	diff2 \|	blob \| history
gtk2_ardour/ardour_ui_dialogs.cc	diff1 \|	diff2 \|	blob \| history
gtk2_ardour/export_video_dialog.cc	diff1 \|	diff2 \|	blob \| history
gtk2_ardour/generic_pluginui.cc	diff1 \|	diff2 \|	blob \| history
gtk2_ardour/global_port_matrix.cc	diff1 \|	diff2 \|	blob \| history
gtk2_ardour/main.cc	diff1 \|	diff2 \|	blob \| history
gtk2_ardour/midi_tracer.cc	diff1 \|	diff2 \|	blob \| history
gtk2_ardour/panner_ui.cc	diff1 \|	diff2 \|	blob \| history
gtk2_ardour/plugin_ui.cc	diff1 \|	diff2 \|	blob \| history
gtk2_ardour/processor_box.cc	diff1 \|	diff2 \|	blob \| history
gtk2_ardour/route_ui.cc	diff1 \|	diff2 \|	blob \| history
gtk2_ardour/utils.cc	diff1 \|	diff2 \|	blob \| history
gtk2_ardour/wscript	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/async_midi_port.h	\|	diff2 \|	blob \| history
libs/ardour/ardour/backend_search_path.h	\|	diff2 \|	blob \| history
libs/ardour/ardour/debug.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/directory_names.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/session.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/async_midi_port.cc	\|	diff2 \|	blob \| history
libs/ardour/audio_diskstream.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/audio_track.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/audioengine.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/backend_search_path.cc	\|	diff2 \|	blob \| history
libs/ardour/debug.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/directory_names.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/export_graph_builder.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/globals.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/io.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/ladspa_plugin.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/ltc_slave.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/lv2_plugin.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/midi_clock_slave.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/midi_diskstream.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/midi_ui.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/mtc_slave.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/panner_manager.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/port.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/port_insert.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/rc_configuration.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/route.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/session.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/session_ltc.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/session_midi.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/session_state.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/wscript	diff1 \|	diff2 \|	blob \| history
libs/midi++2/midi++/port.h	diff1 \|	diff2 \|	blob \| history
libs/midi++2/mmc.cc	diff1 \|	diff2 \|	blob \| history
libs/midi++2/mtc.cc	diff1 \|	diff2 \|	blob \| history
libs/midi++2/parser.cc	diff1 \|	diff2 \|	blob \| history
libs/surfaces/generic_midi/generic_midi_control_protocol.cc	diff1 \|	diff2 \|	blob \| history
libs/surfaces/generic_midi/midicontrollable.cc	diff1 \|	diff2 \|	blob \| history
libs/surfaces/mackie/mackie_control_protocol.cc	diff1 \|	diff2 \|	blob \| history
wscript	diff1 \|	diff2 \|	blob \| history

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

RSS Atom

gtk2_ardour/ardour_ui.cc	diff1 \|	diff2 \|	blob \| history
gtk2_ardour/ardour_ui.h	diff1 \|	diff2 \|	blob \| history
gtk2_ardour/ardour_ui_dialogs.cc	diff1 \|	diff2 \|	blob \| history
gtk2_ardour/export_video_dialog.cc	diff1 \|	diff2 \|	blob \| history
gtk2_ardour/generic_pluginui.cc	diff1 \|	diff2 \|	blob \| history
gtk2_ardour/global_port_matrix.cc	diff1 \|	diff2 \|	blob \| history
gtk2_ardour/main.cc	diff1 \|	diff2 \|	blob \| history
gtk2_ardour/midi_tracer.cc	diff1 \|	diff2 \|	blob \| history
gtk2_ardour/panner_ui.cc	diff1 \|	diff2 \|	blob \| history
gtk2_ardour/plugin_ui.cc	diff1 \|	diff2 \|	blob \| history
gtk2_ardour/processor_box.cc	diff1 \|	diff2 \|	blob \| history
gtk2_ardour/route_ui.cc	diff1 \|	diff2 \|	blob \| history
gtk2_ardour/utils.cc	diff1 \|	diff2 \|	blob \| history
gtk2_ardour/wscript	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/async_midi_port.h	\|	diff2 \|	blob \| history
libs/ardour/ardour/backend_search_path.h	\|	diff2 \|	blob \| history
libs/ardour/ardour/debug.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/directory_names.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/session.h	diff1 \|	diff2 \|	blob \| history
libs/ardour/async_midi_port.cc	\|	diff2 \|	blob \| history
libs/ardour/audio_diskstream.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/audio_track.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/audioengine.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/backend_search_path.cc	\|	diff2 \|	blob \| history
libs/ardour/debug.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/directory_names.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/export_graph_builder.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/globals.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/io.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/ladspa_plugin.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/ltc_slave.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/lv2_plugin.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/midi_clock_slave.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/midi_diskstream.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/midi_ui.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/mtc_slave.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/panner_manager.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/port.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/port_insert.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/rc_configuration.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/route.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/session.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/session_ltc.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/session_midi.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/session_state.cc	diff1 \|	diff2 \|	blob \| history
libs/ardour/wscript	diff1 \|	diff2 \|	blob \| history
libs/midi++2/midi++/port.h	diff1 \|	diff2 \|	blob \| history
libs/midi++2/mmc.cc	diff1 \|	diff2 \|	blob \| history
libs/midi++2/mtc.cc	diff1 \|	diff2 \|	blob \| history
libs/midi++2/parser.cc	diff1 \|	diff2 \|	blob \| history
libs/surfaces/generic_midi/generic_midi_control_protocol.cc	diff1 \|	diff2 \|	blob \| history
libs/surfaces/generic_midi/midicontrollable.cc	diff1 \|	diff2 \|	blob \| history
libs/surfaces/mackie/mackie_control_protocol.cc	diff1 \|	diff2 \|	blob \| history
wscript	diff1 \|	diff2 \|	blob \| history