From owner-cvs-all@FreeBSD.ORG  Mon Jun 13 16:54:21 2005
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id B96B816A41C;
	Mon, 13 Jun 2005 16:54:21 +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 8541043D49;
	Mon, 13 Jun 2005 16:54:21 +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 j5DGsLiT099795;
	Mon, 13 Jun 2005 16:54:21 GMT (envelope-from sam@repoman.freebsd.org)
Received: (from sam@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5DGsLij099794;
	Mon, 13 Jun 2005 16:54:21 GMT (envelope-from sam)
Message-Id: <200506131654.j5DGsLij099794@repoman.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Mon, 13 Jun 2005 16:54:21 +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 wpa_ctrl.c
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Jun 2005 16:54:21 -0000

sam         2005-06-13 16:54:21 UTC

  FreeBSD src repository

  Modified files:
    contrib/wpa_supplicant wpa_ctrl.c 
  Log:
  resolve merge conflicts
  
  Revision  Changes    Path
  1.3       +1 -2      src/contrib/wpa_supplicant/wpa_ctrl.c