From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B77601386F2 for ; Mon, 10 Aug 2015 20:36:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0C771957A1; Mon, 10 Aug 2015 20:36:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3A37E957A1 for ; Mon, 10 Aug 2015 20:36:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DF14A3408A2 for ; Mon, 10 Aug 2015 20:36:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BAC40144 for ; Mon, 10 Aug 2015 20:36:22 +0000 (UTC) From: "Andrew John Hughes" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew John Hughes" Message-ID: <1439238365.32b5df0b488d61fdf64c159f2592529a9b562259.gnu_andrew@gentoo> Subject: [gentoo-commits] proj/java:master commit in: / X-VCS-Repository: proj/java X-VCS-Committer: gnu_andrew X-VCS-Committer-Name: Andrew John Hughes X-VCS-Revision: 32b5df0b488d61fdf64c159f2592529a9b562259 X-VCS-Branch: master Date: Mon, 10 Aug 2015 20:36:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7303dc9c-192f-4f6e-9071-f852e72f28d9 X-Archives-Hash: 9830caafeabd447432cddc5cc1c804d0 commit: 32b5df0b488d61fdf64c159f2592529a9b562259 Author: Andrew John Hughes member fsf org> AuthorDate: Mon Aug 10 20:26:05 2015 +0000 Commit: Andrew John Hughes member fsf org> CommitDate: Mon Aug 10 20:26:05 2015 +0000 URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=32b5df0b Merge ../java.old Conflicts: dev-java/cacao/ChangeLog dev-java/cacao/ChangeLog | 115 +++++++++++++++++++++ ...cacao-1.6.0-r2.ebuild => cacao-1.6.0-r3.ebuild} | 0 dev-java/cacao/files/javac.in | 4 +- 3 files changed, 117 insertions(+), 2 deletions(-)