diff options
author | Jacek Antonelli | 2009-11-14 18:23:52 -0600 |
---|---|---|
committer | Jacek Antonelli | 2009-11-18 00:31:24 -0600 |
commit | 80f22f64f093ab8096de2038d784a70660b7d937 (patch) | |
tree | 2391834cec9a26d7a76374640e35ae3d6f9611bb /linden/indra/newview | |
parent | Fixed a warning about converting string literal to gchar*. (diff) | |
download | meta-impy-80f22f64f093ab8096de2038d784a70660b7d937.zip meta-impy-80f22f64f093ab8096de2038d784a70660b7d937.tar.gz meta-impy-80f22f64f093ab8096de2038d784a70660b7d937.tar.bz2 meta-impy-80f22f64f093ab8096de2038d784a70660b7d937.tar.xz |
Combined and updated the LICENSE-libraries.txt files.
Diffstat (limited to 'linden/indra/newview')
-rwxr-xr-x | linden/indra/newview/viewer_manifest.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index 98398f9..798eab1 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py | |||
@@ -197,7 +197,7 @@ class WindowsManifest(ViewerManifest): | |||
197 | self.gather_documents() | 197 | self.gather_documents() |
198 | 198 | ||
199 | if self.prefix("../..", dst="doc"): | 199 | if self.prefix("../..", dst="doc"): |
200 | self.path("LICENSE-libraries-win32.txt") | 200 | self.path("LICENSE-libraries.txt") |
201 | self.end_prefix("../..") | 201 | self.end_prefix("../..") |
202 | 202 | ||
203 | 203 | ||
@@ -490,7 +490,7 @@ class DarwinManifest(ViewerManifest): | |||
490 | 490 | ||
491 | # From the linden directory | 491 | # From the linden directory |
492 | if self.prefix("../..", dst="doc"): | 492 | if self.prefix("../..", dst="doc"): |
493 | self.path("LICENSE-libraries-mac.txt") | 493 | self.path("LICENSE-libraries.txt") |
494 | self.end_prefix("../..") | 494 | self.end_prefix("../..") |
495 | 495 | ||
496 | self.gather_documents() | 496 | self.gather_documents() |
@@ -715,7 +715,7 @@ class LinuxManifest(ViewerManifest): | |||
715 | 715 | ||
716 | # From the linden directory | 716 | # From the linden directory |
717 | if self.prefix("../..", dst="doc"): | 717 | if self.prefix("../..", dst="doc"): |
718 | self.path("LICENSE-libraries-linux.txt") | 718 | self.path("LICENSE-libraries.txt") |
719 | self.end_prefix("../..") | 719 | self.end_prefix("../..") |
720 | 720 | ||
721 | # Create an appropriate gridargs.dat for this package, denoting required grid. | 721 | # Create an appropriate gridargs.dat for this package, denoting required grid. |