Merge with trunk R2935.
authorDavid Robillard <d@drobilla.net>
Sat, 19 Jan 2008 03:49:52 +0000 (03:49 +0000)
committerDavid Robillard <d@drobilla.net>
Sat, 19 Jan 2008 03:49:52 +0000 (03:49 +0000)
commit4ca1fe7993adf63ea3f35958f63dd20ee546e7ae
treef773e6cf00e08a8260c2e2b28b8e16e28b39b887
parentf80fad313a21228f31201279cccaf555796c7eec
Merge with trunk R2935.

git-svn-id: svn://localhost/ardour2/branches/3.0@2943 d708f5d6-7413-0410-9779-e7cbd77b26cf
44 files changed:
SConstruct
gtk2_ardour/SConscript
gtk2_ardour/about.cc
gtk2_ardour/ardour3_ui_default.conf
gtk2_ardour/ardour_ui.cc
gtk2_ardour/ardour_ui.h
gtk2_ardour/ardour_ui_dependents.cc
gtk2_ardour/ardour_ui_ed.cc
gtk2_ardour/audio_region_view.cc
gtk2_ardour/canvas-waveview.c
gtk2_ardour/canvas-waveview.h
gtk2_ardour/canvas_vars.h
gtk2_ardour/editor.cc
gtk2_ardour/editor.h
gtk2_ardour/editor_actions.cc
gtk2_ardour/editor_ops.cc
gtk2_ardour/main.cc
gtk2_ardour/new_session_dialog.cc
gtk2_ardour/plugin_selector.cc
gtk2_ardour/plugin_selector.h
gtk2_ardour/route_time_axis.cc
gtk2_ardour/splash.cc [new file with mode: 0644]
gtk2_ardour/splash.h [new file with mode: 0644]
gtk2_ardour/time_axis_view.cc
gtk2_ardour/waveview.cc
gtk2_ardour/waveview.h
libs/ardour/SConscript
libs/ardour/ardour/audio_unit.h
libs/ardour/ardour/io.h
libs/ardour/ardour/ladspa_plugin.h
libs/ardour/ardour/lv2_plugin.h [new file with mode: 0644]
libs/ardour/ardour/plugin_manager.h
libs/ardour/ardour/route.h
libs/ardour/ardour/types.h
libs/ardour/audio_diskstream.cc
libs/ardour/io.cc
libs/ardour/lv2_plugin.cc [new file with mode: 0644]
libs/ardour/plugin.cc
libs/ardour/plugin_insert.cc
libs/ardour/plugin_manager.cc
libs/ardour/route.cc
libs/ardour/session_command.cc
svn_revision.h
tools/osx_packaging/script