Merged revisions 1262 via svnmerge from

https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r1262 | kpfleming | 2006-08-08 17:22:24 -0500 (Tue, 08 Aug 2006) | 2 lines

update Octasic API headers (but not code yet) to PR43, and use version with GPL licenses instead of proprietary licenses

........


git-svn-id: http://svn.digium.com/svn/zaptel/trunk@1263 5390a7c7-147a-4af0-8ec9-7488f05a26cb

1 files changed, 19 insertions, 9 deletions

diff --git a/include/octosdependant.h b/include/octosdependant.h
index a55fcf1..b7ff715 100644
--- a/include/octosdependant.h
+++ b/include/octosdependant.h
@@ -2,19 +2,29 @@
 
 File: octosdependant.h
 
-Copyright (c) 2001 Octasic Inc. All rights reserved.
+    Copyright (c) 2001-2006 Octasic Inc.
 
-Description: This file is included to set target-specific constants
+Description: 
 
-This source code is Octasic Confidential. Use of and access to this code
-is covered by the Octasic Device Enabling Software License Agreement. 
-Acknowledgement of the Octasic Device Enabling Software License was 
-required for access to this code. A copy was also provided with the release.
+	This file is included to set target-specific constants.
 
+This file is part of the Octasic OCT6100 GPL API . The OCT6100 GPL API  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 2 of the License, or (at your option) any later version.
 
-$Octasic_Release: OCT610xAPI-01.00-PR37 $
+The OCT6100 GPL API 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. 
 
-$Octasic_Revision: 15 $
+You should have received a copy of the GNU General Public License 
+along with the OCT6100 GPL API; if not, write to the Free Software 
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+
+$Octasic_Release: OCT612xAPI-01.00-PR43 $
+
+$Octasic_Revision: 16 $
 
 \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
@@ -133,6 +143,7 @@ extern "C" {
 #ifdef _DEBUG
 #define OCT_OPT_USER_DEBUG
 #endif
+
 /*--------------------------------------------------------------------------
 	C language
 ----------------------------------------------------------------------------*/
@@ -142,4 +153,3 @@ extern "C" {
 #endif
 
 #endif	/* __OCTOSDEPENDANT_H__ */
-