Merged with trunk R1304
authorDavid Robillard <d@drobilla.net>
Thu, 11 Jan 2007 19:50:49 +0000 (19:50 +0000)
committerDavid Robillard <d@drobilla.net>
Thu, 11 Jan 2007 19:50:49 +0000 (19:50 +0000)
commitf7563c2b158252339f98e38719cfc3e092ef7ac7
treeb90084b8cc82e613a9dfc73202fdffcf0a05481d
parent532f6aad4ac79ca15d69deccd18fca90e444c437
Merged with trunk R1304

git-svn-id: svn://localhost/ardour2/branches/midi@1311 d708f5d6-7413-0410-9779-e7cbd77b26cf
29 files changed:
SConstruct
gtk2_ardour/ardev
gtk2_ardour/ardour.sh.in
gtk2_ardour/ardour_ui.cc
gtk2_ardour/ardour_ui2.cc
gtk2_ardour/ardour_ui_dialogs.cc
gtk2_ardour/audio_clock.cc
gtk2_ardour/audio_streamview.cc
gtk2_ardour/audio_streamview.h
gtk2_ardour/crossfade_edit.cc
gtk2_ardour/crossfade_edit.h
gtk2_ardour/crossfade_view.cc
gtk2_ardour/crossfade_view.h
gtk2_ardour/editor.cc
gtk2_ardour/editor.h
gtk2_ardour/editor_ops.cc
gtk2_ardour/sfdb_ui.cc
libs/ardour/ardour/audioplaylist.h
libs/ardour/ardour/crossfade.h
libs/ardour/ardour/playlist_templates.h
libs/ardour/audio_playlist.cc
libs/ardour/audioengine.cc
libs/ardour/crossfade.cc
libs/ardour/globals.cc
libs/ardour/osc.cc
libs/ardour/session.cc
libs/pbd/pbd/xml++.h
libs/pbd/pthread_utils.cc
libs/pbd/xml++.cc