merge from 2.0-ongoing by hand, minus key binding editor
authorPaul Davis <paul@linuxaudiosystems.com>
Thu, 11 Oct 2007 22:07:47 +0000 (22:07 +0000)
committerPaul Davis <paul@linuxaudiosystems.com>
Thu, 11 Oct 2007 22:07:47 +0000 (22:07 +0000)
commitf7f9d6fdc40248b190ec9c6e1a886261d55777ae
tree080723e9dc35a66013b37acbafc67a6afa929302
parentaa1f736a651376534acaa2268b65d42a3786fff7
merge from 2.0-ongoing by hand, minus key binding editor

git-svn-id: svn://localhost/ardour2/trunk@2539 d708f5d6-7413-0410-9779-e7cbd77b26cf
134 files changed:
SConstruct
gtk2_ardour/SConscript
gtk2_ardour/ardbg
gtk2_ardour/ardev
gtk2_ardour/ardour.menus
gtk2_ardour/ardour.sh.in
gtk2_ardour/ardour2_ui_dark.rc.in
gtk2_ardour/ardour2_ui_default.conf
gtk2_ardour/ardour2_ui_light.rc.in
gtk2_ardour/ardour_dialog.cc
gtk2_ardour/ardour_dialog.h
gtk2_ardour/ardour_ui.cc
gtk2_ardour/ardour_ui.h
gtk2_ardour/ardour_ui2.cc
gtk2_ardour/ardour_ui_dependents.cc
gtk2_ardour/ardour_ui_dialogs.cc
gtk2_ardour/ardour_ui_ed.cc
gtk2_ardour/ardour_ui_options.cc
gtk2_ardour/arprof
gtk2_ardour/arval
gtk2_ardour/audio_region_view.cc
gtk2_ardour/audio_streamview.cc
gtk2_ardour/axis_view.h
gtk2_ardour/editing.h
gtk2_ardour/editing_syms.h
gtk2_ardour/editor.cc
gtk2_ardour/editor.h
gtk2_ardour/editor_actions.cc
gtk2_ardour/editor_audio_import.cc
gtk2_ardour/editor_audiotrack.cc
gtk2_ardour/editor_canvas.cc
gtk2_ardour/editor_keyboard.cc
gtk2_ardour/editor_markers.cc
gtk2_ardour/editor_mouse.cc
gtk2_ardour/editor_ops.cc
gtk2_ardour/editor_region_list.cc
gtk2_ardour/editor_route_list.cc
gtk2_ardour/editor_rulers.cc
gtk2_ardour/engine_dialog.cc [new file with mode: 0644]
gtk2_ardour/engine_dialog.h [new file with mode: 0644]
gtk2_ardour/enums.cc
gtk2_ardour/keyboard.cc
gtk2_ardour/keyboard.h
gtk2_ardour/main.cc
gtk2_ardour/mixer_strip.cc
gtk2_ardour/mixer_ui.cc
gtk2_ardour/mixer_ui.h
gtk2_ardour/new_session_dialog.cc
gtk2_ardour/new_session_dialog.h
gtk2_ardour/option_editor.cc
gtk2_ardour/option_editor.h
gtk2_ardour/opts.cc
gtk2_ardour/opts.h
gtk2_ardour/processor_box.cc
gtk2_ardour/processor_box.h
gtk2_ardour/send_ui.cc
gtk2_ardour/sfdb_ui.cc
gtk2_ardour/sfdb_ui.h
gtk2_ardour/streamview.cc
gtk2_ardour/utils.cc
libs/ardour/SConscript
libs/ardour/ardour/ardour.h
libs/ardour/ardour/audiofilesource.h
libs/ardour/ardour/audiosource.h
libs/ardour/ardour/automatable.h
libs/ardour/ardour/configuration.h
libs/ardour/ardour/configuration_vars.h
libs/ardour/ardour/io.h
libs/ardour/ardour/profile.h
libs/ardour/ardour/resampled_source.h [new file with mode: 0644]
libs/ardour/ardour/route.h
libs/ardour/ardour/session.h
libs/ardour/ardour/sndfilesource.h
libs/ardour/ardour/source_factory.h
libs/ardour/ardour/types.h
libs/ardour/ardour/utils.h
libs/ardour/audio_playlist.cc
libs/ardour/audioengine.cc
libs/ardour/audiofilesource.cc
libs/ardour/audiosource.cc
libs/ardour/auditioner.cc
libs/ardour/automatable.cc
libs/ardour/configuration.cc
libs/ardour/crossfade.cc
libs/ardour/globals.cc
libs/ardour/import.cc
libs/ardour/io.cc
libs/ardour/playlist.cc
libs/ardour/resampled_source.cc [new file with mode: 0644]
libs/ardour/route.cc
libs/ardour/session.cc
libs/ardour/session_events.cc
libs/ardour/session_state.cc
libs/ardour/sndfilesource.cc
libs/ardour/source_factory.cc
libs/ardour/utils.cc
libs/clearlooks/SConscript
libs/clearlooks/clearlooks_style.c
libs/gtkmm2/gtk/gtkmm/toolbar.cc
libs/midi++2/SConscript
libs/midi++2/alsa_sequencer_midiport.cc
libs/midi++2/coremidi_midiport.cc
libs/midi++2/fd_midiport.cc
libs/midi++2/fifomidi.cc
libs/midi++2/jack_midiport.cc
libs/midi++2/midi++/alsa_rawmidi.h
libs/midi++2/midi++/alsa_sequencer.h
libs/midi++2/midi++/coremidi_midiport.h
libs/midi++2/midi++/factory.h
libs/midi++2/midi++/fd_midiport.h
libs/midi++2/midi++/fifomidi.h
libs/midi++2/midi++/jack.h
libs/midi++2/midi++/manager.h
libs/midi++2/midi++/nullmidi.h
libs/midi++2/midi++/port.h
libs/midi++2/midi++/port_request.h [deleted file]
libs/midi++2/midifactory.cc
libs/midi++2/midimanager.cc
libs/midi++2/midiport.cc
libs/midi++2/miditrace.cc
libs/midi++2/mmctest.cc
libs/midi++2/port_request.cc [deleted file]
libs/pbd/SConscript
libs/pbd/convert.cc
libs/pbd/file_utils.cc
libs/pbd/misc.c [new file with mode: 0644]
libs/pbd/pbd/convert.h
libs/pbd/pbd/functor_command.h [new file with mode: 0644]
libs/pbd/pbd/misc.h [new file with mode: 0644]
libs/pbd/pbd/undo.h
libs/pbd/undo.cc
libs/surfaces/generic_midi/generic_midi_control_protocol.cc
libs/surfaces/mackie/mackie_control_protocol_poll.cc
libs/surfaces/powermate/powermate.cc