diff options
author | Merov Linden <merov@lindenlab.com> | 2013-10-14 16:30:08 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2013-10-14 16:30:08 -0700 |
commit | c2f5365f986aab49d5c7cfa2834a68f5b35c09c2 (patch) | |
tree | 4cbbf7bd730ad0ad3aa00569c4364dad51de6082 /indra/newview/installers/darwin | |
parent | 0cf0efb6e31d505bc079f757fe7d832110797199 (diff) | |
parent | f7158bc5afcec1da8b9d2d5a4ed86921e62d4959 (diff) |
Pull merge from lindenlab/viewer-release
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 |