Merge with 2.0-ongoing R2883.
authorDavid Robillard <d@drobilla.net>
Thu, 10 Jan 2008 22:22:29 +0000 (22:22 +0000)
committerDavid Robillard <d@drobilla.net>
Thu, 10 Jan 2008 22:22:29 +0000 (22:22 +0000)
commit8a2e30816ee392b871c5918f769f68cc0196a893
treeeb85739049c0adc6186eea635aaaf65ef03f038f
parentbb457bb960c5bd7ed538f9d31477293415739f68
Merge with 2.0-ongoing R2883.

git-svn-id: svn://localhost/ardour2/trunk@2885 d708f5d6-7413-0410-9779-e7cbd77b26cf
45 files changed:
gtk2_ardour/SConscript
gtk2_ardour/about.cc
gtk2_ardour/ardev_common.sh.in
gtk2_ardour/ardour-sae.menus
gtk2_ardour/ardour.bindings.in
gtk2_ardour/ardour.menus
gtk2_ardour/ardour_ui.cc
gtk2_ardour/ardour_ui.h
gtk2_ardour/ardour_ui_ed.cc
gtk2_ardour/ardour_ui_options.cc
gtk2_ardour/audio_region_view.cc
gtk2_ardour/editor.cc
gtk2_ardour/editor.h
gtk2_ardour/editor_actions.cc
gtk2_ardour/editor_canvas.cc
gtk2_ardour/editor_markers.cc
gtk2_ardour/editor_ops.cc
gtk2_ardour/editor_selection.cc
gtk2_ardour/editor_timefx.cc
gtk2_ardour/engine_dialog.cc
gtk2_ardour/gain_meter.cc
gtk2_ardour/gain_meter.h
gtk2_ardour/keyeditor.cc
gtk2_ardour/keyeditor.h
gtk2_ardour/mixer_ui.cc
gtk2_ardour/new_session_dialog.cc
gtk2_ardour/new_session_dialog.h
gtk2_ardour/po/sv_SE.po
gtk2_ardour/tempo_dialog.cc
gtk2_ardour/tempo_dialog.h
gtk2_ardour/theme_manager.cc
libs/ardour/ardour/configuration_vars.h
libs/ardour/ardour/osc.h
libs/ardour/ardour/session.h
libs/ardour/ardour/types.h
libs/ardour/audio_diskstream.cc
libs/ardour/audioregion.cc
libs/ardour/osc.cc
libs/ardour/plugin_manager.cc
libs/ardour/rb_effect.cc
libs/ardour/session.cc
libs/ardour/session_butler.cc
libs/ardour/session_process.cc
libs/ardour/session_state.cc
libs/ardour/session_transport.cc