diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2010-11-30 03:16:24 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2010-11-30 03:16:24 +0000 |
| commit | 0837b7e828b9fc312fcf8f5741d2ba9683742672 (patch) | |
| tree | 1209ad6c3a50b6fc8c2e7fdc4ce05445f17f1d86 /LICENSE.txt | |
| parent | 1106b00e75e37e7f25a28ee95da560de55520018 (diff) | |
Merge changes from CUPS 1.5svn-r9385.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2873 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'LICENSE.txt')
| -rw-r--r-- | LICENSE.txt | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/LICENSE.txt b/LICENSE.txt index fdad62bc8..2c386e0f9 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,6 @@ CUPS License Agreement - Copyright 2007-2009 by Apple Inc. + Copyright 2007-2010 by Apple Inc. 1 Infinite Loop Cupertino, CA 95014 USA @@ -16,10 +16,8 @@ copy of the exceptions and licenses follow this introduction. The GNU LGPL applies to the CUPS and CUPS Imaging libraries located in the "cups" and "filter" subdirectories of the CUPS -source distribution and in the "cups" include directory and -library files in the binary distributions. The GNU GPL applies to -the remainder of the CUPS distribution, including the "pdftops" -filter which is based upon Xpdf. +source distribution and the files in the "test" subdirectory. The +GNU GPL applies to the remainder of the CUPS distribution. For those not familiar with the GNU GPL, the license basically allows you to: |