From owner-cvs-src@FreeBSD.ORG  Mon Mar 24 19:57:52 2008
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 42BBB1065679;
	Mon, 24 Mar 2008 19:57:52 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 2AA048FC20;
	Mon, 24 Mar 2008 19:57:52 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2OJvqEG018758;
	Mon, 24 Mar 2008 19:57:52 GMT (envelope-from sam@repoman.freebsd.org)
Received: (from sam@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2OJvqKf018757;
	Mon, 24 Mar 2008 19:57:52 GMT (envelope-from sam)
Message-Id: <200803241957.m2OJvqKf018757@repoman.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Mon, 24 Mar 2008 19:57: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 config_winreg.c
 ctrl_iface_named_pipe.c driver_hostap.h eloop_win.c events.c
 main.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: Mon, 24 Mar 2008 19:57:52 -0000

sam         2008-03-24 19:57:52 UTC

  FreeBSD src repository

  Modified files:
    contrib/wpa_supplicant common.h events.c main.c 
                           wpa_supplicant.c 
  Removed files:
    contrib/wpa_supplicant config_winreg.c ctrl_iface_named_pipe.c 
                           driver_hostap.h eloop_win.c 
  Log:
  resolve merge conflicts
  
  MFC after:      3 weeks
  
  Revision  Changes    Path
  1.5       +2 -2      src/contrib/wpa_supplicant/common.h
  1.2       +0 -882    src/contrib/wpa_supplicant/config_winreg.c (dead)
  1.2       +0 -834    src/contrib/wpa_supplicant/ctrl_iface_named_pipe.c (dead)
  1.2       +0 -153    src/contrib/wpa_supplicant/driver_hostap.h (dead)
  1.2       +0 -604    src/contrib/wpa_supplicant/eloop_win.c (dead)
  1.4       +7 -6      src/contrib/wpa_supplicant/events.c
  1.3       +14 -3     src/contrib/wpa_supplicant/main.c
  1.5       +15 -10    src/contrib/wpa_supplicant/wpa_supplicant.c