diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-05-10 10:56:40 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-05-10 10:56:40 -0400 |
| commit | 4d22c32aa9ac42b4a720200386d68339e8656974 (patch) | |
| tree | c84419f0f3ac44d2f64b7082c3c69c1fbec919d2 /indra/newview/installers/darwin | |
| parent | 73e6711268adb93025386ffb766055125f0d849e (diff) | |
| parent | 33d9adfa9a07e0bf6f6ebd8213e843048ec92392 (diff) | |
merge changes for 3.5.2-beta4
Diffstat (limited to 'indra/newview/installers/darwin')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/installers/darwin/dmg-cleanup.applescript | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/newview/installers/darwin/fix_application_icon_position.sh | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/newview/installers/darwin/release-dmg/Applications-alias.r | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/newview/installers/darwin/release-dmg/_DS_Store | bin | 12292 -> 12292 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | indra/newview/installers/darwin/release-dmg/_VolumeIcon.icns | bin | 98049 -> 98049 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | indra/newview/installers/darwin/release-dmg/background.jpg | bin | 75112 -> 75112 bytes |
6 files changed, 0 insertions, 0 deletions
diff --git a/indra/newview/installers/darwin/dmg-cleanup.applescript b/indra/newview/installers/darwin/dmg-cleanup.applescript index 8a71b392f9..8a71b392f9 100644..100755 --- a/indra/newview/installers/darwin/dmg-cleanup.applescript +++ b/indra/newview/installers/darwin/dmg-cleanup.applescript diff --git a/indra/newview/installers/darwin/fix_application_icon_position.sh b/indra/newview/installers/darwin/fix_application_icon_position.sh index 618e34820c..618e34820c 100644..100755 --- a/indra/newview/installers/darwin/fix_application_icon_position.sh +++ b/indra/newview/installers/darwin/fix_application_icon_position.sh diff --git a/indra/newview/installers/darwin/release-dmg/Applications-alias.r b/indra/newview/installers/darwin/release-dmg/Applications-alias.r index aa3cfb87d8..aa3cfb87d8 100644..100755 --- a/indra/newview/installers/darwin/release-dmg/Applications-alias.r +++ b/indra/newview/installers/darwin/release-dmg/Applications-alias.r diff --git a/indra/newview/installers/darwin/release-dmg/_DS_Store b/indra/newview/installers/darwin/release-dmg/_DS_Store Binary files differindex 747ca961d8..747ca961d8 100644..100755 --- a/indra/newview/installers/darwin/release-dmg/_DS_Store +++ b/indra/newview/installers/darwin/release-dmg/_DS_Store diff --git a/indra/newview/installers/darwin/release-dmg/_VolumeIcon.icns b/indra/newview/installers/darwin/release-dmg/_VolumeIcon.icns Binary files differindex da5307e389..da5307e389 100644..100755 --- a/indra/newview/installers/darwin/release-dmg/_VolumeIcon.icns +++ b/indra/newview/installers/darwin/release-dmg/_VolumeIcon.icns diff --git a/indra/newview/installers/darwin/release-dmg/background.jpg b/indra/newview/installers/darwin/release-dmg/background.jpg Binary files differindex 55294dcc9a..55294dcc9a 100644..100755 --- a/indra/newview/installers/darwin/release-dmg/background.jpg +++ b/indra/newview/installers/darwin/release-dmg/background.jpg |
