diff options
| author | Jacek Antonelli | 2009-11-19 04:19:06 -0600 |
|---|---|---|
| committer | Jacek Antonelli | 2009-11-19 04:19:06 -0600 |
| commit | 1d443b7a94ed6f9ef1d408caef72fcbc0b1ee427 (patch) | |
| tree | e09ccbc010e326a48fd91ba15b58afd7fb836b3f /linden/indra/newview/llpanellandoptions.h | |
| parent | Fixed minor formatting issue in MANIFESTO.txt. (diff) | |
| parent | Fixed CMake setting errors (diff) | |
| download | meta-impy-1d443b7a94ed6f9ef1d408caef72fcbc0b1ee427.zip meta-impy-1d443b7a94ed6f9ef1d408caef72fcbc0b1ee427.tar.gz meta-impy-1d443b7a94ed6f9ef1d408caef72fcbc0b1ee427.tar.bz2 meta-impy-1d443b7a94ed6f9ef1d408caef72fcbc0b1ee427.tar.xz | |
Merge remote branch 'mccabe/1.3.0-next' into next
Conflicts:
linden/indra/cmake/00-Common.cmake
linden/indra/newview/skins/default/xui/de/floater_about.xml
linden/indra/newview/skins/default/xui/fr/floater_about.xml
linden/indra/newview/skins/default/xui/ja/floater_about.xml
linden/indra/newview/skins/default/xui/ko/floater_about.xml
linden/indra/newview/skins/default/xui/zh/floater_about.xml
linden/install.xml
Diffstat (limited to 'linden/indra/newview/llpanellandoptions.h')
| -rw-r--r-- | linden/indra/newview/llpanellandoptions.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/newview/llpanellandoptions.h b/linden/indra/newview/llpanellandoptions.h index 12983d1..1c7c07d 100644 --- a/linden/indra/newview/llpanellandoptions.h +++ b/linden/indra/newview/llpanellandoptions.h | |||
| @@ -18,7 +18,8 @@ | |||
| 18 | * There are special exceptions to the terms and conditions of the GPL as | 18 | * There are special exceptions to the terms and conditions of the GPL as |
| 19 | * it is applied to this Source Code. View the full text of the exception | 19 | * it is applied to this Source Code. View the full text of the exception |
| 20 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 20 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
| 21 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception | 21 | * online at |
| 22 | * http://secondlifegrid.net/programs/open_source/licensing/flossexception | ||
| 22 | * | 23 | * |
| 23 | * By copying, modifying or distributing this software, you acknowledge | 24 | * By copying, modifying or distributing this software, you acknowledge |
| 24 | * that you have read and understood your obligations described above, | 25 | * that you have read and understood your obligations described above, |