summaryrefslogtreecommitdiff
path: root/indra/media_plugins/base
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2018-10-17 10:31:59 -0400
committerNat Goodspeed <nat@lindenlab.com>2018-10-17 10:31:59 -0400
commit036c52fcdf425fe79a9aa6682cd7c7fe709a2442 (patch)
tree80b637dd5876fa63fa247567aa5c267cfaf10441 /indra/media_plugins/base
parent3abc0095c9e39faf8976ef815b0da656423c4905 (diff)
parentbffe112cf5a1b9dd8acf5146c733a0fe186f6e89 (diff)
Automated merge with ssh://bitbucket.org/nat_linden/viewer-poseidon
Diffstat (limited to 'indra/media_plugins/base')
-rw-r--r--indra/media_plugins/base/CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/media_plugins/base/CMakeLists.txt b/indra/media_plugins/base/CMakeLists.txt
index 70c81d4023..7f2b82ffdd 100644
--- a/indra/media_plugins/base/CMakeLists.txt
+++ b/indra/media_plugins/base/CMakeLists.txt
@@ -48,5 +48,5 @@ set(media_plugin_base_HEADER_FILES
add_library(media_plugin_base
${media_plugin_base_SOURCE_FILES}
-)
+ )