merge -r 13409:13412 svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0

git-svn-id: svn://localhost/ardour2/branches/3.0-SG@13413 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-11-09 14:43:08 +00:00
parent 98a70a905b
commit e793fbf211
5 changed files with 28 additions and 26 deletions

View file

@ -344,7 +344,7 @@ cp ../../gtk2_ardour/mixer.bindings $Resources
cp ../../gtk2_ardour/step_editing.bindings $Resources
cp $BUILD_ROOT/gtk2_ardour/ardour.menus $Resources
# cp $BUILD_ROOT/ardour_system.rc $Resources/ardour_system.rc
cp ../../ardour_system.rc $Resources/ardour_system.rc
cp ../../instant.xml $Resources/instant.xml
cp ../../gtk2_ardour/ardour3_ui_default.conf $Resources
cp ../../gtk2_ardour/ardour3_ui_default.conf $Resources/ardour3_ui.conf