summaryrefslogtreecommitdiff
path: root/indra/media_plugins/quicktime/media_plugin_quicktime.cpp
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2009-12-01 16:43:39 +0200
committerVadim Savchuk <vsavchuk@productengine.com>2009-12-01 16:43:39 +0200
commit3474fc42283a0891abb1f7c8f74677921a33690f (patch)
tree654050d93737bd66a405a0e97b60c5c50f5f5894 /indra/media_plugins/quicktime/media_plugin_quicktime.cpp
parent0699c41e7c951464f759f63f43f4dea2a85ba528 (diff)
parent8b75c2154985346317b56928276f875073d6d69f (diff)
Merge from default branch.
--HG-- branch : product-engine
Diffstat (limited to 'indra/media_plugins/quicktime/media_plugin_quicktime.cpp')
-rw-r--r--indra/media_plugins/quicktime/media_plugin_quicktime.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/media_plugins/quicktime/media_plugin_quicktime.cpp b/indra/media_plugins/quicktime/media_plugin_quicktime.cpp
index 236f79978d..dbc44c8334 100644
--- a/indra/media_plugins/quicktime/media_plugin_quicktime.cpp
+++ b/indra/media_plugins/quicktime/media_plugin_quicktime.cpp
@@ -2,6 +2,7 @@
* @file media_plugin_quicktime.cpp
* @brief QuickTime plugin for LLMedia API plugin system
*
+ * @cond
* $LicenseInfo:firstyear=2008&license=viewergpl$
*
* Copyright (c) 2008, Linden Research, Inc.
@@ -27,6 +28,7 @@
* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
* COMPLETENESS OR PERFORMANCE.
* $/LicenseInfo$
+ * @endcond
*/
#include "linden_common.h"