From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1NYhu7-0000s9-SN for garchives@archives.gentoo.org; Sat, 23 Jan 2010 15:28:04 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ED810E05FC; Sat, 23 Jan 2010 15:28:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C4D94E05FC for ; Sat, 23 Jan 2010 15:28:01 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 6E79A1B4001 for ; Sat, 23 Jan 2010 15:28:01 +0000 (UTC) Received: from scarabeus by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1NYhu4-0005Dj-No for gentoo-commits@lists.gentoo.org; Sat, 23 Jan 2010 15:28:01 +0000 From: "Tomas Chvatal (scarabeus)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, scarabeus@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in profiles: package.mask X-VCS-Repository: gentoo-x86 X-VCS-Files: package.mask X-VCS-Directories: profiles X-VCS-Committer: scarabeus X-VCS-Committer-Name: Tomas Chvatal Content-Type: text/plain; charset=utf8 Message-Id: Sender: Tomas Chvatal Date: Sat, 23 Jan 2010 15:28:00 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 8a9beed6-a6b7-436b-b756-d660761595e4 X-Archives-Hash: a2ef03d24795cb2f1369a363b6c9e0d3 scarabeus 10/01/23 15:28:00 Modified: package.mask Log: Remove wrongly merged collision. Revision Changes Path 1.11146 profiles/package.mask file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/profiles/package.m= ask?rev=3D1.11146&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/profiles/package.m= ask?rev=3D1.11146&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/profiles/package.m= ask?r1=3D1.11145&r2=3D1.11146 Index: package.mask =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/profiles/package.mask,v retrieving revision 1.11145 retrieving revision 1.11146 diff -u -r1.11145 -r1.11146 --- package.mask 23 Jan 2010 15:06:23 -0000 1.11145 +++ package.mask 23 Jan 2010 15:27:59 -0000 1.11146 @@ -1,5 +1,5 @@ #################################################################### -# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11145 2010/= 01/23 15:06:23 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11146 2010/= 01/23 15:27:59 scarabeus Exp $ # # When you add an entry to the top of this file, add your name, the date= , and # an explanation of why something is getting masked. Please be extremely @@ -622,10 +622,6 @@ # Beta versions of sudo =3Dapp-admin/sudo-1.7.3_beta* =20 -# Luca Barbato (06 Dec 2009) # on behalf of QA team #