diff options
| author | Jouni Malinen <j@w1.fi> | 2012-08-09 15:29:25 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2012-08-09 15:30:10 -0700 |
| commit | 80da0428ce21beb670d31bd06d025d8609d658b4 (patch) | |
| tree | 15e9075644523e0c8f80e4a587918a92a3c601bd /README | |
| parent | b5e8f06e18446918f6d801566e5709a8c87f1780 (diff) | |
| download | external_wpa_supplicant_8-80da0428ce21beb670d31bd06d025d8609d658b4.zip external_wpa_supplicant_8-80da0428ce21beb670d31bd06d025d8609d658b4.tar.gz external_wpa_supplicant_8-80da0428ce21beb670d31bd06d025d8609d658b4.tar.bz2 | |
Minor cleaning to be closer to mainstream
Change-Id: I4aed30c59c549c2ce7488f12df4e68c6154f0ffe
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'README')
| -rw-r--r-- | README | 29 |
1 files changed, 5 insertions, 24 deletions
@@ -1,12 +1,11 @@ wpa_supplicant and hostapd -------------------------- -Copyright (c) 2002-2011, Jouni Malinen <j@w1.fi> and contributors +Copyright (c) 2002-2012, Jouni Malinen <j@w1.fi> and contributors All Rights Reserved. -These programs are dual-licensed under both the GPL version 2 and BSD -license (the one with advertisement clause removed). Either license -may be used at your option. +These programs are licensed under the BSD license (the one with +advertisement clause removed). This package may include either wpa_supplicant, hostapd, or both. See @@ -23,26 +22,8 @@ builds). License ------- -GPL v2: - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License version 2 as -published by the Free Software Foundation. - -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. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -(this copy of the license is in COPYING file) - - -Alternatively, this software may be distributed, used, and modified -under the terms of BSD license: +This software may be distributed, used, and modified under the terms of +BSD license: Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are |