From owner-cvs-all@FreeBSD.ORG  Sat Jun  2 17:01:43 2012
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id E431A1065670;
	Sat,  2 Jun 2012 17:01:43 +0000 (UTC)
	(envelope-from madpilot@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B75EC8FC14;
	Sat,  2 Jun 2012 17:01:43 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id q52H1ho0031990;
	Sat, 2 Jun 2012 17:01:43 GMT
	(envelope-from madpilot@repoman.freebsd.org)
Received: (from madpilot@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id q52H1hwh031989;
	Sat, 2 Jun 2012 17:01:43 GMT (envelope-from madpilot)
Message-Id: <201206021701.q52H1hwh031989@repoman.freebsd.org>
From: Guido Falsi <madpilot@FreeBSD.org>
Date: Sat, 2 Jun 2012 17:01:43 +0000 (UTC)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: ports/x11/trayer Makefile ports/x11/trayer-srg Makefile
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** 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: Sat, 02 Jun 2012 17:01:44 -0000

madpilot    2012-06-02 17:01:43 UTC

  FreeBSD ports repository

  Modified files:
    x11/trayer           Makefile 
    x11/trayer-srg       Makefile 
  Log:
  - Fix conflicts
  
  While I'm here take maintainership of x11/trayer
  
  Reported by:    Sulev-Madis "ketas" Silber <madis555@hot.ee> (by e-mail)
  Approved by:    crees, tabthorpe (mentors, implicit)
  
  Revision  Changes    Path
  1.7       +1 -1      ports/x11/trayer-srg/Makefile
  1.15      +3 -1      ports/x11/trayer/Makefile