diff options
author | Rick Pasetto <rick@lindenlab.com> | 2009-11-30 15:26:26 -0800 |
---|---|---|
committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-30 15:26:26 -0800 |
commit | ee314f6df61a0c7e379c9f47ba3690b4a65eacd4 (patch) | |
tree | 45d2ddc7d36298014118b6ddc14038af22d6b39c /indra/media_plugins/quicktime/media_plugin_quicktime.cpp | |
parent | 6223485bfafb9343f4e352014dec7f53717bcb47 (diff) | |
parent | 8e3276ebf9fc87b3d622dd23dbf22b10ffb494f2 (diff) |
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/media_plugins/quicktime/media_plugin_quicktime.cpp')
-rw-r--r-- | indra/media_plugins/quicktime/media_plugin_quicktime.cpp | 2 |
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" |