merge from trunk
authorHans Fugal <hans@fugal.net>
Wed, 9 Aug 2006 21:31:36 +0000 (21:31 +0000)
committerHans Fugal <hans@fugal.net>
Wed, 9 Aug 2006 21:31:36 +0000 (21:31 +0000)
commita160eb92db7fafff70dbe09d5f007b265b4f5efb
tree7b966165d676c3d61c1d821f6bae3afcec9606e7
parentc26215c1e59b6341da86f94f5b2b3ca950dd3889
merge from trunk

git-svn-id: svn://localhost/ardour2/branches/undo@773 d708f5d6-7413-0410-9779-e7cbd77b26cf
16 files changed:
SConstruct
gtk2_ardour/automation_time_axis.cc
gtk2_ardour/main.cc
gtk2_ardour/new_session_dialog.cc
gtk2_ardour/new_session_dialog.h
gtk2_ardour/opts.cc
gtk2_ardour/plugin_ui.cc
gtk2_ardour/plugin_ui.h
gtk2_ardour/route_params_ui.cc
libs/ardour/ardour/audio_unit.h
libs/ardour/ardour/route.h
libs/ardour/ardour/tempo.h
libs/ardour/ardour/track.h
libs/ardour/audio_unit.cc
libs/ardour/io.cc
libs/ardour/track.cc