summaryrefslogtreecommitdiff
path: root/indra/test_apps
diff options
context:
space:
mode:
authorsimon <none@none>2013-05-09 13:14:49 -0700
committersimon <none@none>2013-05-09 13:14:49 -0700
commitc7f7c4bc4d9155f5e9cd83265e189f689739da62 (patch)
tree2d4c7e5996a2c5af92f45cf43b8b6dab2e03229f /indra/test_apps
parent5af5b49a6205c34b8787cd4ecb4bd1d94174663f (diff)
parentd8f00dd1d1d40ec387583575149b1bf9bae79f32 (diff)
Merge viewer-beta
Diffstat (limited to 'indra/test_apps')
-rwxr-xr-x[-rw-r--r--]indra/test_apps/llplugintest/CMakeLists.txt0
-rwxr-xr-x[-rw-r--r--]indra/test_apps/llplugintest/bookmarks.txt0
-rwxr-xr-x[-rw-r--r--]indra/test_apps/llplugintest/llmediaplugintest.cpp0
-rwxr-xr-x[-rw-r--r--]indra/test_apps/llplugintest/llmediaplugintest.h0
4 files changed, 0 insertions, 0 deletions
diff --git a/indra/test_apps/llplugintest/CMakeLists.txt b/indra/test_apps/llplugintest/CMakeLists.txt
index 8179be66f5..8179be66f5 100644..100755
--- a/indra/test_apps/llplugintest/CMakeLists.txt
+++ b/indra/test_apps/llplugintest/CMakeLists.txt
diff --git a/indra/test_apps/llplugintest/bookmarks.txt b/indra/test_apps/llplugintest/bookmarks.txt
index 2ff64f217f..2ff64f217f 100644..100755
--- a/indra/test_apps/llplugintest/bookmarks.txt
+++ b/indra/test_apps/llplugintest/bookmarks.txt
diff --git a/indra/test_apps/llplugintest/llmediaplugintest.cpp b/indra/test_apps/llplugintest/llmediaplugintest.cpp
index 884b00f0cc..884b00f0cc 100644..100755
--- a/indra/test_apps/llplugintest/llmediaplugintest.cpp
+++ b/indra/test_apps/llplugintest/llmediaplugintest.cpp
diff --git a/indra/test_apps/llplugintest/llmediaplugintest.h b/indra/test_apps/llplugintest/llmediaplugintest.h
index 1f6f18e43c..1f6f18e43c 100644..100755
--- a/indra/test_apps/llplugintest/llmediaplugintest.h
+++ b/indra/test_apps/llplugintest/llmediaplugintest.h