diff options
| author | simon <none@none> | 2013-05-09 14:10:45 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-05-09 14:10:45 -0700 |
| commit | ee2fce8790b69d61845cc32fbf7cdce8a33b0dab (patch) | |
| tree | 5060f42dca293102c868038f127c1a74f5c4a6aa /indra/media_plugins/example | |
| parent | cd8e0b92e1c8f9f8544b1011e61c21c7789b93b7 (diff) | |
| parent | 8895e795763d14c3dae495b3648da3d4a52ba30a (diff) | |
Merge downstream code and viewer-beta
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 |