diff options
| author | xue <> | 2006-06-10 11:28:30 +0000 |
|---|---|---|
| committer | xue <> | 2006-06-10 11:28:30 +0000 |
| commit | c6b4190fab88201f4efaa0d00a6aa823b180f482 (patch) | |
| tree | e3be39a8eaefca800017dd866422b1039e1db77a /COPYRIGHT | |
| parent | 112d86bb08a1dd4bde14005f757c95b0fc7a5a21 (diff) | |
Merge from 3.0 branch till 1148.
Diffstat (limited to 'COPYRIGHT')
| -rw-r--r-- | COPYRIGHT | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -1,7 +1,7 @@ -PRADO is free software released under the terms of the following BSD license.
+The PRADO framework and the included demos are freeware.
+They are released under the terms of the following BSD License.
-PRADO is released under the BSD License.
-Copyright 2004-2006, PradoSoft (http://www.pradosoft.com)
+Copyright 2004-2006, The PRADO Group (http://www.pradosoft.com)
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -14,9 +14,9 @@ this list of conditions and the following disclaimer. this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
-- Neither the name of the developer nor the names of its contributors may
-be used to endorse or promote products derived from this software without
-specific prior written permission.
+- Neither the name of the PRADO Group nor the names of its contributors
+may be used to endorse or promote products derived from this software
+without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|