ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/utils/cfutil.in
(Generate patch)

Comparing deliantra/server/utils/cfutil.in (file contents):
Revision 1.124 by root, Sun Nov 11 05:53:12 2012 UTC vs.
Revision 1.125 by root, Mon Nov 19 00:40:55 2012 UTC

770 %{ $meta->{"" } || {} }, 770 %{ $meta->{"" } || {} },
771 %{ $meta->{$file} || {} }, 771 %{ $meta->{$file} || {} },
772 }; 772 };
773 773
774 if (exists $meta->{license} && $meta->{license} =~ s/^#//) { # exists == avoid autovivification 774 if (exists $meta->{license} && $meta->{license} =~ s/^#//) { # exists == avoid autovivification
775 # all these are acceptable for deliantra - if not specified, agpl 3+ is the default.
775 $meta->{license} = ({ 776 $meta->{license} = ({
776 "pd" => "Public Domain", 777 "pd" => "Public Domain",
777 "gpl" => "GNU General Public License, version 3.0 or any later", 778 "gpl" => "GNU General Public License, version 3.0 or any later",
779 "2bsd" => "2-clause BSD/MIT style license",
780 "3bsd" => "3-clause BSD style license",
778 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/", 781 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
779 "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/", 782 "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/",
780 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/", 783 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
781 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/", 784 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
782 })->{$meta->{license}} 785 })->{$meta->{license}}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines