summaryrefslogtreecommitdiff
path: root/indra/mac_crash_logger
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2013-05-22 14:21:49 -0700
committerMerov Linden <merov@lindenlab.com>2013-05-22 14:21:49 -0700
commit1c740dfb516aa03ea07d37f12de8a98b94be9572 (patch)
tree89275e879c17603736bb1ab69392ed24aa1d4d57 /indra/mac_crash_logger
parent53ed2e4ac67088dce27f4c391d3e980e2d63154b (diff)
parent0ebcb7e3fd1452d42b5ca48139f99a4fd632d235 (diff)
Pull merge from viewer-release
Diffstat (limited to 'indra/mac_crash_logger')
-rwxr-xr-x[-rw-r--r--]indra/mac_crash_logger/CMakeLists.txt0
-rwxr-xr-x[-rw-r--r--]indra/mac_crash_logger/CrashReporter.nibbin32288 -> 32288 bytes
-rwxr-xr-x[-rw-r--r--]indra/mac_crash_logger/CrashReporter.xib0
-rwxr-xr-x[-rw-r--r--]indra/mac_crash_logger/Info.plist0
-rwxr-xr-x[-rw-r--r--]indra/mac_crash_logger/llcrashloggermac.cpp0
-rwxr-xr-x[-rw-r--r--]indra/mac_crash_logger/llcrashloggermac.h0
-rwxr-xr-x[-rw-r--r--]indra/mac_crash_logger/llcrashloggermacdelegate.h0
-rwxr-xr-x[-rw-r--r--]indra/mac_crash_logger/llcrashloggermacdelegate.mm0
-rwxr-xr-x[-rw-r--r--]indra/mac_crash_logger/mac_crash_logger.cpp0
9 files changed, 0 insertions, 0 deletions
diff --git a/indra/mac_crash_logger/CMakeLists.txt b/indra/mac_crash_logger/CMakeLists.txt
index c59645bd70..c59645bd70 100644..100755
--- a/indra/mac_crash_logger/CMakeLists.txt
+++ b/indra/mac_crash_logger/CMakeLists.txt
diff --git a/indra/mac_crash_logger/CrashReporter.nib b/indra/mac_crash_logger/CrashReporter.nib
index a30d8d205c..a30d8d205c 100644..100755
--- a/indra/mac_crash_logger/CrashReporter.nib
+++ b/indra/mac_crash_logger/CrashReporter.nib
Binary files differ
diff --git a/indra/mac_crash_logger/CrashReporter.xib b/indra/mac_crash_logger/CrashReporter.xib
index f6d4776d51..f6d4776d51 100644..100755
--- a/indra/mac_crash_logger/CrashReporter.xib
+++ b/indra/mac_crash_logger/CrashReporter.xib
diff --git a/indra/mac_crash_logger/Info.plist b/indra/mac_crash_logger/Info.plist
index 2ebed11c3f..2ebed11c3f 100644..100755
--- a/indra/mac_crash_logger/Info.plist
+++ b/indra/mac_crash_logger/Info.plist
diff --git a/indra/mac_crash_logger/llcrashloggermac.cpp b/indra/mac_crash_logger/llcrashloggermac.cpp
index c5f660ca6e..c5f660ca6e 100644..100755
--- a/indra/mac_crash_logger/llcrashloggermac.cpp
+++ b/indra/mac_crash_logger/llcrashloggermac.cpp
diff --git a/indra/mac_crash_logger/llcrashloggermac.h b/indra/mac_crash_logger/llcrashloggermac.h
index 6d8f63ecac..6d8f63ecac 100644..100755
--- a/indra/mac_crash_logger/llcrashloggermac.h
+++ b/indra/mac_crash_logger/llcrashloggermac.h
diff --git a/indra/mac_crash_logger/llcrashloggermacdelegate.h b/indra/mac_crash_logger/llcrashloggermacdelegate.h
index c998a8efe2..c998a8efe2 100644..100755
--- a/indra/mac_crash_logger/llcrashloggermacdelegate.h
+++ b/indra/mac_crash_logger/llcrashloggermacdelegate.h
diff --git a/indra/mac_crash_logger/llcrashloggermacdelegate.mm b/indra/mac_crash_logger/llcrashloggermacdelegate.mm
index b2af76a47c..b2af76a47c 100644..100755
--- a/indra/mac_crash_logger/llcrashloggermacdelegate.mm
+++ b/indra/mac_crash_logger/llcrashloggermacdelegate.mm
diff --git a/indra/mac_crash_logger/mac_crash_logger.cpp b/indra/mac_crash_logger/mac_crash_logger.cpp
index 6add74556f..6add74556f 100644..100755
--- a/indra/mac_crash_logger/mac_crash_logger.cpp
+++ b/indra/mac_crash_logger/mac_crash_logger.cpp