diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-03-07 09:46:02 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-03-07 09:46:02 -0500 |
| commit | c7ebeb842010c4a814978f63c464e1546bd6a9be (patch) | |
| tree | de77b0d9a9fe53ff35d660b0e8731b91abe2ff94 /indra/win_crash_logger | |
| parent | 8c7a8bdc4a795a158dc8a47928245b0dd74df3f5 (diff) | |
| parent | 4fd57774dd8491ffc760114b6d89fd0ab1989bbd (diff) | |
merge with El Capitan and packaging fixes
Diffstat (limited to 'indra/win_crash_logger')
| -rw-r--r--[-rwxr-xr-x] | indra/win_crash_logger/CMakeLists.txt | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/win_crash_logger/StdAfx.cpp | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/win_crash_logger/StdAfx.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/win_crash_logger/ll_icon.ico | bin | 2238 -> 2238 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | indra/win_crash_logger/resource.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/win_crash_logger/win_crash_logger.cpp | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/win_crash_logger/win_crash_logger.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/win_crash_logger/win_crash_logger.ico | bin | 1078 -> 1078 bytes |
8 files changed, 0 insertions, 0 deletions
diff --git a/indra/win_crash_logger/CMakeLists.txt b/indra/win_crash_logger/CMakeLists.txt index c6070020db..c6070020db 100755..100644 --- a/indra/win_crash_logger/CMakeLists.txt +++ b/indra/win_crash_logger/CMakeLists.txt diff --git a/indra/win_crash_logger/StdAfx.cpp b/indra/win_crash_logger/StdAfx.cpp index f56711af73..f56711af73 100755..100644 --- a/indra/win_crash_logger/StdAfx.cpp +++ b/indra/win_crash_logger/StdAfx.cpp diff --git a/indra/win_crash_logger/StdAfx.h b/indra/win_crash_logger/StdAfx.h index 35976658ac..35976658ac 100755..100644 --- a/indra/win_crash_logger/StdAfx.h +++ b/indra/win_crash_logger/StdAfx.h diff --git a/indra/win_crash_logger/ll_icon.ico b/indra/win_crash_logger/ll_icon.ico Binary files differindex 566346dfe3..566346dfe3 100755..100644 --- a/indra/win_crash_logger/ll_icon.ico +++ b/indra/win_crash_logger/ll_icon.ico diff --git a/indra/win_crash_logger/resource.h b/indra/win_crash_logger/resource.h index 37a387275e..37a387275e 100755..100644 --- a/indra/win_crash_logger/resource.h +++ b/indra/win_crash_logger/resource.h diff --git a/indra/win_crash_logger/win_crash_logger.cpp b/indra/win_crash_logger/win_crash_logger.cpp index 366edd894b..366edd894b 100755..100644 --- a/indra/win_crash_logger/win_crash_logger.cpp +++ b/indra/win_crash_logger/win_crash_logger.cpp diff --git a/indra/win_crash_logger/win_crash_logger.h b/indra/win_crash_logger/win_crash_logger.h index 2cc2cf3dcf..2cc2cf3dcf 100755..100644 --- a/indra/win_crash_logger/win_crash_logger.h +++ b/indra/win_crash_logger/win_crash_logger.h diff --git a/indra/win_crash_logger/win_crash_logger.ico b/indra/win_crash_logger/win_crash_logger.ico Binary files differindex 386883523b..386883523b 100755..100644 --- a/indra/win_crash_logger/win_crash_logger.ico +++ b/indra/win_crash_logger/win_crash_logger.ico |