From faf167aed99ac4e28927f729b7c7bc94a47ef139 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Sun, 26 Jul 2009 22:33:56 -0400 Subject: merged in latest Mikes changes --- LICENSE | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'LICENSE') diff --git a/LICENSE b/LICENSE index e23e4b67..cb24f678 100644 --- a/LICENSE +++ b/LICENSE @@ -1,12 +1,14 @@ -版权所有(c) 2008 CNProg.com +Copyright (C) 2009. Chen Gang -根据2.0版本Apache许可证("许可证")授权； -根据本许可证，用户可以不使用此文件。 -用户可从下列网址获得许可证副本： +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. -http://www.apache.org/licenses/LICENSE-2.0 +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. -除非因适用法律需要或书面同意， -根据许可证分发的软件是基于"按原样"基础提供， -无任何明示的或暗示的保证或条件。 -详见根据许可证许可下，特定语言的管辖权限和限制。 \ No newline at end of file +You should have received a copy of the GNU General Public License +along with this program. If not, see . -- cgit v1.2.3-1-g7c22