Merge remote-tracking branch 'remotes/origin/master' into windows+cc

This commit is contained in:
John Emmas
2013-10-16 15:55:59 +01:00
13 changed files with 1861 additions and 1666 deletions

View File

@@ -531,6 +531,7 @@ fi
# share stuff
cp -R ../../gtk2_ardour/splash.png $Shared
cp -R ../../gtk2_ardour/small-splash.png $Shared
cp -R ../../gtk2_ardour/ArdourMono.ttf $Shared
# go through and recursively remove any .svn dirs in the bundle

View File

@@ -409,6 +409,7 @@ cp -r ../../gtk2_ardour/pixmaps $Resources
# shared stuff
cp -R ../../gtk2_ardour/splash.png $Shared
cp -R ../../gtk2_ardour/small-splash.png $Shared
cp -R ../../gtk2_ardour/ArdourMono.ttf $Shared
# go through and recursively remove any .svn dirs in the bundle