1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-16 00:34:19 +00:00

Merge remote-tracking branch 'gh/master' into develop

This commit is contained in:
jules 2014-11-04 10:12:56 +00:00
commit 03da8fb4ba
12 changed files with 75 additions and 63 deletions

View file

@ -86,7 +86,7 @@ static const unsigned char temp_binary_data_0[] =
" rm -r \"$AAX1\"\r\n"
" fi\r\n"
"\r\n"
" cp -r \"$original\" \"$AAX1\"\r\n"
" cp -R -H \"$original\" \"$AAX1\"\r\n"
" fi\r\n"
"\r\n"
" if [ -d \"/Library/Application Support/Avid/Audio/Plug-Ins\" ]; then\r\n"
@ -96,7 +96,7 @@ static const unsigned char temp_binary_data_0[] =
" rm -r \"$AAX2\"\r\n"
" fi\r\n"
"\r\n"
" cp -r \"$original\" \"$AAX2\"\r\n"
" cp -R -H \"$original\" \"$AAX2\"\r\n"
" fi\r\n"
"fi\r\n";
@ -3274,7 +3274,7 @@ const char* getNamedResource (const char* resourceNameUTF8, int& numBytes) throw
switch (hash)
{
case 0x44be9398: numBytes = 2916; return AudioPluginXCodeScript_txt;
case 0x44be9398: numBytes = 2922; return AudioPluginXCodeScript_txt;
case 0x4a0cfd09: numBytes = 151; return background_tile_png;
case 0x763d39dc: numBytes = 1050; return colourscheme_dark_xml;
case 0xe8b08520: numBytes = 1050; return colourscheme_light_xml;