summaryrefslogtreecommitdiff
path: root/indra/newview/installers/darwin
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-04-19 14:42:56 -0400
committerOz Linden <oz@lindenlab.com>2013-04-19 14:42:56 -0400
commit3bb708d70636188b91a6e8476a3b899441de0468 (patch)
tree85790d906bed73e19138004c4a54fc3fed952d85 /indra/newview/installers/darwin
parent327c99cadbcbe15442eaee8e0625ade17dcda61f (diff)
parentddd5659f815a39e9a8ef0e86c911fea75a7d8848 (diff)
merge up to latest viewer-development for merge to 3.5.2
Diffstat (limited to 'indra/newview/installers/darwin')
-rwxr-xr-x[-rw-r--r--]indra/newview/installers/darwin/dmg-cleanup.applescript0
-rwxr-xr-x[-rw-r--r--]indra/newview/installers/darwin/fix_application_icon_position.sh0
-rwxr-xr-x[-rw-r--r--]indra/newview/installers/darwin/release-dmg/Applications-alias.r0
-rwxr-xr-x[-rw-r--r--]indra/newview/installers/darwin/release-dmg/_DS_Storebin12292 -> 12292 bytes
-rwxr-xr-x[-rw-r--r--]indra/newview/installers/darwin/release-dmg/_VolumeIcon.icnsbin98049 -> 98049 bytes
-rwxr-xr-x[-rw-r--r--]indra/newview/installers/darwin/release-dmg/background.jpgbin75112 -> 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
index 747ca961d8..747ca961d8 100644..100755
--- a/indra/newview/installers/darwin/release-dmg/_DS_Store
+++ b/indra/newview/installers/darwin/release-dmg/_DS_Store
Binary files differ
diff --git a/indra/newview/installers/darwin/release-dmg/_VolumeIcon.icns b/indra/newview/installers/darwin/release-dmg/_VolumeIcon.icns
index da5307e389..da5307e389 100644..100755
--- a/indra/newview/installers/darwin/release-dmg/_VolumeIcon.icns
+++ b/indra/newview/installers/darwin/release-dmg/_VolumeIcon.icns
Binary files differ
diff --git a/indra/newview/installers/darwin/release-dmg/background.jpg b/indra/newview/installers/darwin/release-dmg/background.jpg
index 55294dcc9a..55294dcc9a 100644..100755
--- a/indra/newview/installers/darwin/release-dmg/background.jpg
+++ b/indra/newview/installers/darwin/release-dmg/background.jpg
Binary files differ