diff options
author | Oz Linden <oz@lindenlab.com> | 2013-04-19 10:11:29 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-04-19 10:11:29 -0400 |
commit | ddd5659f815a39e9a8ef0e86c911fea75a7d8848 (patch) | |
tree | cfccad35552a7aa72b57ce965e3a8e5ec5e5ef4a /indra/mac_crash_logger | |
parent | ed2b5da8f1eb51e747f6d9f5a4fc535cbf7e69d9 (diff) | |
parent | be1bb8d76dd33bf331cadeb817a89eb2940ac578 (diff) |
merge changes for DRTVWR-294
Diffstat (limited to 'indra/mac_crash_logger')
-rwxr-xr-x[-rw-r--r--] | indra/mac_crash_logger/CMakeLists.txt | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | indra/mac_crash_logger/CrashReporter.nib | bin | 32288 -> 32288 bytes | |||
-rwxr-xr-x[-rw-r--r--] | indra/mac_crash_logger/CrashReporter.xib | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | indra/mac_crash_logger/Info.plist | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | indra/mac_crash_logger/llcrashloggermac.cpp | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | indra/mac_crash_logger/llcrashloggermac.h | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | indra/mac_crash_logger/llcrashloggermacdelegate.h | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | indra/mac_crash_logger/llcrashloggermacdelegate.mm | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | indra/mac_crash_logger/mac_crash_logger.cpp | 0 |
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 Binary files differindex a30d8d205c..a30d8d205c 100644..100755 --- a/indra/mac_crash_logger/CrashReporter.nib +++ b/indra/mac_crash_logger/CrashReporter.nib 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 |