summaryrefslogtreecommitdiff
path: root/indra/mac_updater
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-04-19 10:11:29 -0400
committerOz Linden <oz@lindenlab.com>2013-04-19 10:11:29 -0400
commitddd5659f815a39e9a8ef0e86c911fea75a7d8848 (patch)
treecfccad35552a7aa72b57ce965e3a8e5ec5e5ef4a /indra/mac_updater
parented2b5da8f1eb51e747f6d9f5a4fc535cbf7e69d9 (diff)
parentbe1bb8d76dd33bf331cadeb817a89eb2940ac578 (diff)
merge changes for DRTVWR-294
Diffstat (limited to 'indra/mac_updater')
-rwxr-xr-x[-rw-r--r--]indra/mac_updater/AutoUpdater.nib/classes.nib0
-rwxr-xr-x[-rw-r--r--]indra/mac_updater/AutoUpdater.nib/info.nib0
-rwxr-xr-x[-rw-r--r--]indra/mac_updater/AutoUpdater.nib/objects.xib0
-rwxr-xr-x[-rw-r--r--]indra/mac_updater/CMakeLists.txt0
-rwxr-xr-x[-rw-r--r--]indra/mac_updater/Info.plist0
-rwxr-xr-x[-rw-r--r--]indra/mac_updater/mac_updater.cpp0
-rwxr-xr-x[-rw-r--r--]indra/mac_updater/mac_updater.h0
7 files changed, 0 insertions, 0 deletions
diff --git a/indra/mac_updater/AutoUpdater.nib/classes.nib b/indra/mac_updater/AutoUpdater.nib/classes.nib
index ea58db1189..ea58db1189 100644..100755
--- a/indra/mac_updater/AutoUpdater.nib/classes.nib
+++ b/indra/mac_updater/AutoUpdater.nib/classes.nib
diff --git a/indra/mac_updater/AutoUpdater.nib/info.nib b/indra/mac_updater/AutoUpdater.nib/info.nib
index a49a92385b..a49a92385b 100644..100755
--- a/indra/mac_updater/AutoUpdater.nib/info.nib
+++ b/indra/mac_updater/AutoUpdater.nib/info.nib
diff --git a/indra/mac_updater/AutoUpdater.nib/objects.xib b/indra/mac_updater/AutoUpdater.nib/objects.xib
index 310411b711..310411b711 100644..100755
--- a/indra/mac_updater/AutoUpdater.nib/objects.xib
+++ b/indra/mac_updater/AutoUpdater.nib/objects.xib
diff --git a/indra/mac_updater/CMakeLists.txt b/indra/mac_updater/CMakeLists.txt
index a644984e58..a644984e58 100644..100755
--- a/indra/mac_updater/CMakeLists.txt
+++ b/indra/mac_updater/CMakeLists.txt
diff --git a/indra/mac_updater/Info.plist b/indra/mac_updater/Info.plist
index bb27fddb03..bb27fddb03 100644..100755
--- a/indra/mac_updater/Info.plist
+++ b/indra/mac_updater/Info.plist
diff --git a/indra/mac_updater/mac_updater.cpp b/indra/mac_updater/mac_updater.cpp
index aa45c5d23f..aa45c5d23f 100644..100755
--- a/indra/mac_updater/mac_updater.cpp
+++ b/indra/mac_updater/mac_updater.cpp
diff --git a/indra/mac_updater/mac_updater.h b/indra/mac_updater/mac_updater.h
index f65b481cb6..f65b481cb6 100644..100755
--- a/indra/mac_updater/mac_updater.h
+++ b/indra/mac_updater/mac_updater.h