From owner-cvs-src@FreeBSD.ORG  Wed Jul 11 15:58:53 2007
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 [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 0D4B116A400;
	Wed, 11 Jul 2007 15:58:53 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id F119713C447;
	Wed, 11 Jul 2007 15:58:52 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6BFwqrU036970;
	Wed, 11 Jul 2007 15:58:52 GMT (envelope-from sam@repoman.freebsd.org)
Received: (from sam@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6BFwqhl036966;
	Wed, 11 Jul 2007 15:58:52 GMT (envelope-from sam)
Message-Id: <200707111558.l6BFwqhl036966@repoman.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Wed, 11 Jul 2007 15:58:52 +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 common.h driver_ndis_.c
 events.c wpa_ctrl.c wpa_supplicant.c
 src/contrib/wpa_supplicant/wpa_gui-qt4 eventhistory.ui.h networkconfig.ui.h
 scanresults.ui.h userdatarequest.ui.h wpagui.ui.h
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: Wed, 11 Jul 2007 15:58:53 -0000

sam         2007-07-11 15:58:52 UTC

  FreeBSD src repository

  Modified files:
    contrib/wpa_supplicant common.h events.c wpa_ctrl.c 
                           wpa_supplicant.c 
  Removed files:
    contrib/wpa_supplicant driver_ndis_.c 
    contrib/wpa_supplicant/wpa_gui-qt4 eventhistory.ui.h 
                                       networkconfig.ui.h 
                                       scanresults.ui.h 
                                       userdatarequest.ui.h 
                                       wpagui.ui.h 
  Log:
  resolve merge conflicts
  
  Reviewed by:    thompsa, sephe
  Approved by:    re (hrs)
  
  Revision  Changes    Path
  1.4       +257 -55   src/contrib/wpa_supplicant/common.h
  1.2       +0 -164    src/contrib/wpa_supplicant/driver_ndis_.c (dead)
  1.3       +191 -66   src/contrib/wpa_supplicant/events.c
  1.5       +241 -54   src/contrib/wpa_supplicant/wpa_ctrl.c
  1.2       +0 -41     src/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui.h (dead)
  1.2       +0 -513    src/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui.h (dead)
  1.2       +0 -101    src/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui.h (dead)
  1.2       +0 -70     src/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui.h (dead)
  1.2       +0 -651    src/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui.h (dead)
  1.4       +683 -256  src/contrib/wpa_supplicant/wpa_supplicant.c