summaryrefslogtreecommitdiff
path: root/indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h
diff options
context:
space:
mode:
authorRick Pasetto <rick@lindenlab.com>2009-11-30 15:26:26 -0800
committerRick Pasetto <rick@lindenlab.com>2009-11-30 15:26:26 -0800
commitee314f6df61a0c7e379c9f47ba3690b4a65eacd4 (patch)
tree45d2ddc7d36298014118b6ddc14038af22d6b39c /indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h
parent6223485bfafb9343f4e352014dec7f53717bcb47 (diff)
parent8e3276ebf9fc87b3d622dd23dbf22b10ffb494f2 (diff)
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h')
-rw-r--r--indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h b/indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h
index e31d4a3282..2244ccc146 100644
--- a/indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h
+++ b/indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h
@@ -2,6 +2,7 @@
* @file llmediaimplgstreamertriviallogging.h
* @brief minimal logging utilities.
*
+ * @cond
* $LicenseInfo:firstyear=2009&license=viewergpl$
*
* Copyright (c) 2009, Linden Research, Inc.
@@ -28,6 +29,7 @@
* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
* COMPLETENESS OR PERFORMANCE.
* $/LicenseInfo$
+ * @endcond
*/
#ifndef __LLMEDIAIMPLGSTREAMERTRIVIALLOGGING_H__