X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=README;h=1721a3b222124c0b56d4c3bdca2b77f1b1f8fc83;hb=50178335bff450829729c91c8af798a1d3a7b408;hp=186e4b9dfea54decc31c338fceb7af396d3f166e;hpb=eb32192b72d6a9fa918870c9997e0cc7c9efeb2f;p=thirdparty%2Fhostap.git diff --git a/README b/README index 186e4b9df..1721a3b22 100644 --- a/README +++ b/README @@ -1,12 +1,11 @@ wpa_supplicant and hostapd -------------------------- -Copyright (c) 2002-2011, Jouni Malinen and contributors +Copyright (c) 2002-2012, Jouni Malinen 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). If you are submitting changes to the project, please see CONTRIBUTIONS file for more instructions. @@ -26,26 +25,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