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 1Sd5jt-0005DG-0L for garchives@archives.gentoo.org; Fri, 08 Jun 2012 20:24:57 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 686EFE079E; Fri, 8 Jun 2012 20:24:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 330E3E079E for ; Fri, 8 Jun 2012 20:24:49 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 690B61B4015 for ; Fri, 8 Jun 2012 20:24:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 29C2FE5432 for ; Fri, 8 Jun 2012 20:24:47 +0000 (UTC) From: "Markos Chandras" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Markos Chandras" Message-ID: <1339187115.10665df4465a4b51be12ca1d5bbaa00cad49113d.hwoarang@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: Documentation/maintainers/ X-VCS-Repository: proj/qt X-VCS-Files: Documentation/maintainers/bump-python-revisions X-VCS-Directories: Documentation/maintainers/ X-VCS-Committer: hwoarang X-VCS-Committer-Name: Markos Chandras X-VCS-Revision: 10665df4465a4b51be12ca1d5bbaa00cad49113d X-VCS-Branch: master Date: Fri, 8 Jun 2012 20:24:47 +0000 (UTC) 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: 2c074450-e498-46e2-8c74-5be2b668fdbd X-Archives-Hash: f5218f352a6f5b5ea06eb6fc725e680b commit: 10665df4465a4b51be12ca1d5bbaa00cad49113d Author: Markos Chandras gentoo org> AuthorDate: Fri Jun 8 20:25:15 2012 +0000 Commit: Markos Chandras gentoo org> CommitDate: Fri Jun 8 20:25:15 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/qt.git;a=3Dco= mmit;h=3D10665df4 bump-python-revisions: Fix merge leftover --- Documentation/maintainers/bump-python-revisions | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/Documentation/maintainers/bump-python-revisions b/Documentat= ion/maintainers/bump-python-revisions index 3ffb23e..f1183ae 100755 --- a/Documentation/maintainers/bump-python-revisions +++ b/Documentation/maintainers/bump-python-revisions @@ -142,7 +142,6 @@ einfo """ ########################################################### """ =20 -<<<<<<< HEAD ebegin "Updating tree" git pull eend $?