summaryrefslogtreecommitdiff
path: root/indra/llplugin/slplugin
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2013-05-21 16:18:48 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2013-05-21 16:18:48 -0400
commita04a706c1bf145505afd2da8d149ba909b56045f (patch)
tree574c526e1cf87bd840157151649d82eb689f2c5b /indra/llplugin/slplugin
parent0f6a4a3389cdce6d5bb92cd6f4861a46def284cc (diff)
parent0ebcb7e3fd1452d42b5ca48139f99a4fd632d235 (diff)
merge
Diffstat (limited to 'indra/llplugin/slplugin')
-rwxr-xr-x[-rw-r--r--]indra/llplugin/slplugin/CMakeLists.txt0
-rwxr-xr-x[-rw-r--r--]indra/llplugin/slplugin/slplugin-objc.h0
-rwxr-xr-x[-rw-r--r--]indra/llplugin/slplugin/slplugin-objc.mm0
-rwxr-xr-x[-rw-r--r--]indra/llplugin/slplugin/slplugin.cpp0
-rwxr-xr-x[-rw-r--r--]indra/llplugin/slplugin/slplugin_info.plist0
5 files changed, 0 insertions, 0 deletions
diff --git a/indra/llplugin/slplugin/CMakeLists.txt b/indra/llplugin/slplugin/CMakeLists.txt
index 03412d95d5..03412d95d5 100644..100755
--- 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 f2c2b3239c..f2c2b3239c 100644..100755
--- 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 a434739350..a434739350 100644..100755
--- 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 6c9ba0ae52..6c9ba0ae52 100644..100755
--- 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 100644..100755
--- a/indra/llplugin/slplugin/slplugin_info.plist
+++ b/indra/llplugin/slplugin/slplugin_info.plist