Merged with trunk R1761
authorDavid Robillard <d@drobilla.net>
Sun, 29 Apr 2007 17:23:11 +0000 (17:23 +0000)
committerDavid Robillard <d@drobilla.net>
Sun, 29 Apr 2007 17:23:11 +0000 (17:23 +0000)
commitb3fe7cfc892f7d5978ad14eb81e9305fa9c14d13
tree4c6617c0397fb1ad3bef1f5fced35fb64b022ccb
parent490e18d80a22dda07bdf88dd440f7100897822de
Merged with trunk R1761

git-svn-id: svn://localhost/ardour2/branches/midi@1762 d708f5d6-7413-0410-9779-e7cbd77b26cf
34 files changed:
SConstruct
ardour.rc.in
ardour_system.rc [deleted file]
gtk2_ardour/ardour.colors
gtk2_ardour/ardour2_ui.rc
gtk2_ardour/ardour_ui.cc
gtk2_ardour/ardour_ui.h
gtk2_ardour/audio_streamview.cc
gtk2_ardour/audio_streamview.h
gtk2_ardour/automation_time_axis.cc
gtk2_ardour/editor.cc
gtk2_ardour/editor.h
gtk2_ardour/editor_mixer.cc
gtk2_ardour/editor_mouse.cc
gtk2_ardour/enums.cc
gtk2_ardour/mixer_strip.cc
gtk2_ardour/mixer_strip.h
gtk2_ardour/mixer_ui.cc
gtk2_ardour/new_session_dialog.cc
gtk2_ardour/new_session_dialog.h
gtk2_ardour/route_time_axis.cc
gtk2_ardour/route_time_axis.h
gtk2_ardour/route_ui.h
gtk2_ardour/streamview.cc
gtk2_ardour/time_axis_view_item.cc
libs/ardour/audio_playlist.cc
libs/ardour/audioengine.cc
libs/ardour/control_protocol_manager.cc
libs/ardour/insert.cc
libs/ardour/session_command.cc
libs/ardour/session_state.cc
svn_revision.h
tools/osx_packaging/ardour2_mac_ui.rc
tools/session_exchange.py