summaryrefslogtreecommitdiff
path: root/indra/newview/installers
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-11-24 06:56:57 -0500
committerOz Linden <oz@lindenlab.com>2011-11-24 06:56:57 -0500
commitb69be18d7b41b639d3c62354ca7ab6e3bc32f1cb (patch)
tree355347be68e29f59ad5299abd9b42423359eb60e /indra/newview/installers
parentfb605a047aa1c6b293b9546a06ac800c53d109ba (diff)
parent8c86a08e72708e96dcf67830518187a00478bbfd (diff)
merge changes for vmrg-193
Diffstat (limited to 'indra/newview/installers')
-rw-r--r--[-rwxr-xr-x]indra/newview/installers/darwin/fix_application_icon_position.sh0
-rw-r--r--[-rwxr-xr-x]indra/newview/installers/windows/installer_template.nsi0
2 files changed, 0 insertions, 0 deletions
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 100755..100644
--- 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/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
index 8a6114f0d5..8a6114f0d5 100755..100644
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi