diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-05-10 10:56:40 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-05-10 10:56:40 -0400 |
| commit | 4d22c32aa9ac42b4a720200386d68339e8656974 (patch) | |
| tree | c84419f0f3ac44d2f64b7082c3c69c1fbec919d2 /indra/media_plugins/example | |
| parent | 73e6711268adb93025386ffb766055125f0d849e (diff) | |
| parent | 33d9adfa9a07e0bf6f6ebd8213e843048ec92392 (diff) | |
merge changes for 3.5.2-beta4
Diffstat (limited to 'indra/media_plugins/example')
| -rwxr-xr-x[-rw-r--r--] | indra/media_plugins/example/CMakeLists.txt | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/media_plugins/example/media_plugin_example.cpp | 0 |
2 files changed, 0 insertions, 0 deletions
diff --git a/indra/media_plugins/example/CMakeLists.txt b/indra/media_plugins/example/CMakeLists.txt index 171645ef04..171645ef04 100644..100755 --- a/indra/media_plugins/example/CMakeLists.txt +++ b/indra/media_plugins/example/CMakeLists.txt diff --git a/indra/media_plugins/example/media_plugin_example.cpp b/indra/media_plugins/example/media_plugin_example.cpp index da7de01799..da7de01799 100644..100755 --- a/indra/media_plugins/example/media_plugin_example.cpp +++ b/indra/media_plugins/example/media_plugin_example.cpp |