From c6b4190fab88201f4efaa0d00a6aa823b180f482 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Sat, 10 Jun 2006 11:28:30 +0000
Subject: Merge from 3.0 branch till 1148.

---
 COPYRIGHT | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'COPYRIGHT')

diff --git a/COPYRIGHT b/COPYRIGHT
index 72fe0bfe..f44d0d05 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -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"
-- 
cgit v1.2.3