From owner-cvs-src@FreeBSD.ORG  Tue Mar  7 05:44:46 2006
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@FreeBSD.org
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 85EDE16A420;
	Tue,  7 Mar 2006 05:44:46 +0000 (GMT) (envelope-from sam@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 52FC043D45;
	Tue,  7 Mar 2006 05:44:46 +0000 (GMT) (envelope-from sam@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k275ikn3045309;
	Tue, 7 Mar 2006 05:44:46 GMT (envelope-from sam@repoman.freebsd.org)
Received: (from sam@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k275ikLK045308;
	Tue, 7 Mar 2006 05:44:46 GMT (envelope-from sam)
Message-Id: <200603070544.k275ikLK045308@repoman.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Tue, 7 Mar 2006 05:44:46 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/contrib/wpa_supplicant FREEBSD-Xlist common.h
 developer.txt events.c hostap_common.h wpa_ctrl.c wpa_supplicant.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Mar 2006 05:44:46 -0000

sam         2006-03-07 05:44:46 UTC

  FreeBSD src repository

  Modified files:
    contrib/wpa_supplicant FREEBSD-Xlist common.h events.c 
                           wpa_ctrl.c wpa_supplicant.c 
  Removed files:
    contrib/wpa_supplicant developer.txt hostap_common.h 
  Log:
  resolve merge conflicts
  
  MFC after:      2 weeks
  
  Revision  Changes     Path
  1.3       +3 -1       src/contrib/wpa_supplicant/FREEBSD-Xlist
  1.3       +77 -13     src/contrib/wpa_supplicant/common.h
  1.2       +0 -458     src/contrib/wpa_supplicant/developer.txt (dead)
  1.2       +15 -0      src/contrib/wpa_supplicant/events.c
  1.2       +0 -557     src/contrib/wpa_supplicant/hostap_common.h (dead)
  1.4       +14 -4      src/contrib/wpa_supplicant/wpa_ctrl.c
  1.3       +855 -1166  src/contrib/wpa_supplicant/wpa_supplicant.c