Merge branch 'HEAD' of ssh://jams@knoppmyth.net/mount/repository/LinHES-PKGBUILD.git

Conflicts:
	abs/core-testing/LinHES-config/PKGBUILD

1 files changed, 57 insertions, 0 deletions

diff --git a/abs/core-testing/wlan-ng26-utils/tmp/trunk/COPYING b/abs/core-testing/wlan-ng26-utils/tmp/trunk/COPYING
new file mode 100644
index 0000000..66801bd
--- /dev/null
+++ b/abs/core-testing/wlan-ng26-utils/tmp/trunk/COPYING
@@ -0,0 +1,57 @@
+* COPYING
+*
+* Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.
+* --------------------------------------------------------------------
+*
+* linux-wlan
+*
+*   The contents of this file are subject to the Mozilla Public
+*   License Version 1.1 (the "License"); you may not use this file
+*   except in compliance with the License. You may obtain a copy of
+*   the License at http://www.mozilla.org/MPL/
+*
+*   Software distributed under the License is distributed on an "AS
+*   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+*   implied. See the License for the specific language governing
+*   rights and limitations under the License.
+*
+*   Alternatively, the contents of this file may be used under the
+*   terms of the GNU Public License version 2 (the "GPL"), in which
+*   case the provisions of the GPL are applicable instead of the
+*   above.  If you wish to allow the use of your version of this file
+*   only under the terms of the GPL and not to allow others to use
+*   your version of this file under the MPL, indicate your decision
+*   by deleting the provisions above and replace them with the notice
+*   and other provisions required by the GPL.  If you do not delete
+*   the provisions above, a recipient may use your version of this
+*   file under either the MPL or the GPL.
+*
+* --------------------------------------------------------------------
+*
+* Inquiries regarding the linux-wlan Open Source project can be
+* made directly to:
+*
+* AbsoluteValue Systems Inc.
+* info@linux-wlan.com
+* http://www.linux-wlan.com
+*
+* --------------------------------------------------------------------
+*
+* Portions of the development of this software were funded by 
+* Intersil Corporation as part of PRISM(R) chipset product development.
+*
+* --------------------------------------------------------------------
+
+Unless otherwise indicated, this code is distributed under version 1.1
+of the Mozilla Public License ("MPL"), included in the LICENSE file.
+
+Where this software is combined with software released under the terms
+of the GNU Public License ("GPL") and the terms of the GPL would
+require the combined work to also be released under the terms of the
+GPL, the terms and conditions of the MPL will apply in addition to
+those of the GPL with the exception of any terms or conditions of the
+MPL that conflict with, or are expressly prohibited by, the GPL.
+
+        -- AbsoluteValue Systems, Inc.
+
+Note: This file is derived from a copyrighted work of David Hinds.