Merge windows+cc branch into cairocanvas branch. Not finished, need to now merge...
authorPaul Davis <paul@linuxaudiosystems.com>
Fri, 10 Jan 2014 21:07:57 +0000 (16:07 -0500)
committerPaul Davis <paul@linuxaudiosystems.com>
Fri, 10 Jan 2014 21:07:57 +0000 (16:07 -0500)
commit3020b224fa2d6e1b6b8a576e8e8e211e0585f2a2
tree314c3099bcc57d9af09d249e1e7dd8e45baca642
parentd15fda6d751a465d278f477923075d4783f3b1ca
parent897fbdc652434d3aa1e67223c3c3ef7ae9be2318
Merge windows+cc branch into cairocanvas branch. Not finished, need to now merge windows branch to get changes from there
98 files changed:
gtk2_ardour/ardour_ui.cc
gtk2_ardour/ardour_ui.h
gtk2_ardour/ardour_ui_dialogs.cc
gtk2_ardour/audio_clock.cc
gtk2_ardour/audio_region_view.cc
gtk2_ardour/audio_region_view.h
gtk2_ardour/automation_line.cc
gtk2_ardour/automation_time_axis.cc
gtk2_ardour/editor_canvas.cc
gtk2_ardour/editor_drag.cc
gtk2_ardour/editor_markers.cc
gtk2_ardour/editor_ops.cc
gtk2_ardour/editor_rulers.cc
gtk2_ardour/editor_timefx.cc
gtk2_ardour/editor_videotimeline.cc
gtk2_ardour/export_dialog.cc
gtk2_ardour/generic_pluginui.cc
gtk2_ardour/gtk_pianokeyboard.c
gtk2_ardour/main.cc
gtk2_ardour/meter_patterns.cc
gtk2_ardour/midi_region_view.cc
gtk2_ardour/mixer_strip.cc
gtk2_ardour/panner_ui.cc
gtk2_ardour/plugin_selector.cc
gtk2_ardour/port_matrix.cc
gtk2_ardour/processor_box.cc
gtk2_ardour/rc_option_editor.cc
gtk2_ardour/return_ui.cc
gtk2_ardour/route_time_axis.cc
gtk2_ardour/route_ui.cc
gtk2_ardour/send_ui.cc
gtk2_ardour/sfdb_ui.cc
gtk2_ardour/wscript
libs/ardour/ardour/filesystem_paths.h
libs/ardour/ardour/panner.h
libs/ardour/ardour/panner_manager.h
libs/ardour/ardour/session.h
libs/ardour/audioengine.cc
libs/ardour/control_protocol_manager.cc
libs/ardour/export_handler.cc
libs/ardour/globals.cc
libs/ardour/lv2_plugin.cc
libs/ardour/meter.cc
libs/ardour/midi_clock_slave.cc
libs/ardour/midi_ui.cc
libs/ardour/panner_manager.cc
libs/ardour/panner_search_path.cc
libs/ardour/plugin_manager.cc
libs/ardour/port_insert.cc
libs/ardour/route.cc
libs/ardour/session.cc
libs/ardour/session_state.cc
libs/ardour/utils.cc
libs/ardour/vst_plugin.cc
libs/ardour/wscript
libs/audiographer/audiographer/broadcast_info.h
libs/backends/jack/jack_utils.cc
libs/backends/jack/wscript
libs/clearlooks-newer/clearlooks_draw_glossy.c
libs/clearlooks-newer/clearlooks_rc_style.c
libs/evoral/src/libsmf/smf.c
libs/evoral/src/libsmf/smf_decode.c
libs/evoral/src/libsmf/smf_load.c
libs/evoral/src/libsmf/smf_save.c
libs/evoral/src/libsmf/smf_tempo.c
libs/midi++2/ipmidi_port.cc
libs/midi++2/midi++/ipmidi_port.h
libs/midi++2/midi++/port.h
libs/midi++2/midnam_patch.cc
libs/midi++2/mmc.cc
libs/panners/1in2out/panner_1in2out.cc
libs/panners/1in2out/wscript
libs/panners/2in2out/panner_2in2out.cc
libs/panners/2in2out/wscript
libs/panners/stereobalance/wscript
libs/panners/vbap/vbap.cc
libs/panners/vbap/wscript
libs/pbd/fpu.cc
libs/pbd/pbd/search_path.h
libs/pbd/pbd/stacktrace.h
libs/pbd/semutils.cc
libs/pbd/stacktrace.cc
libs/pbd/wscript
libs/surfaces/control_protocol/control_protocol/control_protocol.h
libs/surfaces/control_protocol/wscript
libs/surfaces/generic_midi/generic_midi_control_protocol.cc
libs/surfaces/generic_midi/wscript
libs/surfaces/mackie/interface.cc
libs/surfaces/mackie/mackie_control_protocol.cc
libs/surfaces/mackie/wscript
libs/surfaces/osc/interface.cc
libs/surfaces/osc/osc.cc
libs/surfaces/osc/wscript
libs/surfaces/tranzport/wscript
libs/surfaces/wiimote/interface.cc
libs/surfaces/wiimote/wscript
libs/taglib/wscript
wscript