diff options
author | Armin Weatherwax | 2010-06-14 17:51:51 +0200 |
---|---|---|
committer | Armin Weatherwax | 2010-09-23 15:42:38 +0200 |
commit | 093b99196f27b518b183953cade1077fa6d7c5ed (patch) | |
tree | 154ce4bfa2fbdeae561aa4b115568e4ec2680861 /linden/indra/llplugin/llpluginsharedmemory.h | |
parent | update to latest SG2 media_plugins (diff) | |
download | meta-impy-093b99196f27b518b183953cade1077fa6d7c5ed.zip meta-impy-093b99196f27b518b183953cade1077fa6d7c5ed.tar.gz meta-impy-093b99196f27b518b183953cade1077fa6d7c5ed.tar.bz2 meta-impy-093b99196f27b518b183953cade1077fa6d7c5ed.tar.xz |
update llplugin to latest version of SG2, pull latest webkit
Diffstat (limited to 'linden/indra/llplugin/llpluginsharedmemory.h')
-rwxr-xr-x | linden/indra/llplugin/llpluginsharedmemory.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/linden/indra/llplugin/llpluginsharedmemory.h b/linden/indra/llplugin/llpluginsharedmemory.h index 1d23cbe..081d311 100755 --- a/linden/indra/llplugin/llpluginsharedmemory.h +++ b/linden/indra/llplugin/llpluginsharedmemory.h | |||
@@ -12,13 +12,13 @@ | |||
12 | * ("GPL"), unless you have obtained a separate licensing agreement | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
13 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 13 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
15 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 | 15 | * online at http://secondlife.com/developers/opensource/gplv2 |
16 | * | 16 | * |
17 | * There are special exceptions to the terms and conditions of the GPL as | 17 | * There are special exceptions to the terms and conditions of the GPL as |
18 | * it is applied to this Source Code. View the full text of the exception | 18 | * it is applied to this Source Code. View the full text of the exception |
19 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 19 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
20 | * online at | 20 | * online at |
21 | * http://secondlifegrid.net/programs/open_source/licensing/flossexception | 21 | * http://secondlife.com/developers/opensource/flossexception |
22 | * | 22 | * |
23 | * By copying, modifying or distributing this software, you acknowledge | 23 | * By copying, modifying or distributing this software, you acknowledge |
24 | * that you have read and understood your obligations described above, | 24 | * that you have read and understood your obligations described above, |
@@ -28,6 +28,7 @@ | |||
28 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, | 28 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, |
29 | * COMPLETENESS OR PERFORMANCE. | 29 | * COMPLETENESS OR PERFORMANCE. |
30 | * $/LicenseInfo$ | 30 | * $/LicenseInfo$ |
31 | * | ||
31 | * @endcond | 32 | * @endcond |
32 | */ | 33 | */ |
33 | 34 | ||