diff options
| author | callum_linden <none@none> | 2016-05-19 11:00:03 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2016-05-19 11:00:03 -0700 |
| commit | 9c4ed8d1138de86041b740139c4deec1bc6bf8ee (patch) | |
| tree | d7452bc7faeae01964f13faaa16e2812b27ba93c /indra/llplugin/slplugin | |
| parent | e6fb7564b02ba73c8a402efaca65cb944ce7bef2 (diff) | |
| parent | c2ef3b4c7186dbbd95b16520f281b7d58364fb52 (diff) | |
Automated merge with tip of viewer-release to pick up 4.0.5
Diffstat (limited to 'indra/llplugin/slplugin')
| -rw-r--r--[-rwxr-xr-x] | indra/llplugin/slplugin/CMakeLists.txt | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/llplugin/slplugin/slplugin-objc.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/llplugin/slplugin/slplugin-objc.mm | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/llplugin/slplugin/slplugin.cpp | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/llplugin/slplugin/slplugin_info.plist | 0 |
5 files changed, 0 insertions, 0 deletions
diff --git a/indra/llplugin/slplugin/CMakeLists.txt b/indra/llplugin/slplugin/CMakeLists.txt index 0e5e835777..0e5e835777 100755..100644 --- a/indra/llplugin/slplugin/CMakeLists.txt +++ b/indra/llplugin/slplugin/CMakeLists.txt diff --git a/indra/llplugin/slplugin/slplugin-objc.h b/indra/llplugin/slplugin/slplugin-objc.h index af0ebe1af2..af0ebe1af2 100755..100644 --- a/indra/llplugin/slplugin/slplugin-objc.h +++ b/indra/llplugin/slplugin/slplugin-objc.h diff --git a/indra/llplugin/slplugin/slplugin-objc.mm b/indra/llplugin/slplugin/slplugin-objc.mm index a5ab1d95c8..a5ab1d95c8 100755..100644 --- a/indra/llplugin/slplugin/slplugin-objc.mm +++ b/indra/llplugin/slplugin/slplugin-objc.mm diff --git a/indra/llplugin/slplugin/slplugin.cpp b/indra/llplugin/slplugin/slplugin.cpp index 684bcf1207..684bcf1207 100755..100644 --- a/indra/llplugin/slplugin/slplugin.cpp +++ b/indra/llplugin/slplugin/slplugin.cpp diff --git a/indra/llplugin/slplugin/slplugin_info.plist b/indra/llplugin/slplugin/slplugin_info.plist index c4597380e0..c4597380e0 100755..100644 --- a/indra/llplugin/slplugin/slplugin_info.plist +++ b/indra/llplugin/slplugin/slplugin_info.plist |