From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-896159-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 2FB3C13832E
	for <garchives@archives.gentoo.org>; Mon,  8 Aug 2016 14:58:27 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 93E9DE08E9;
	Mon,  8 Aug 2016 14:58:24 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 143C4E08E9
	for <gentoo-commits@lists.gentoo.org>; Mon,  8 Aug 2016 14:58:23 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id CBFED340924
	for <gentoo-commits@lists.gentoo.org>; Mon,  8 Aug 2016 14:58:22 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 91EF4244C
	for <gentoo-commits@lists.gentoo.org>; Mon,  8 Aug 2016 14:58:20 +0000 (UTC)
From: "Andrew John Hughes" <gnu_andrew@member.fsf.org>
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" <gnu_andrew@member.fsf.org>
Message-ID: <1470668261.d94b96e1c24fdab42a450fc626187cb661a926c1.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: d94b96e1c24fdab42a450fc626187cb661a926c1
X-VCS-Branch: master
Date: Mon,  8 Aug 2016 14:58:20 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 704dd8f4-596c-4bad-8739-295c4a82ad55
X-Archives-Hash: 9cc669bb7ad0a2e63e5e1b75488faea8

commit:     d94b96e1c24fdab42a450fc626187cb661a926c1
Author:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Mon Aug  8 14:57:41 2016 +0000
Commit:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Mon Aug  8 14:57:41 2016 +0000
URL:        https://gitweb.gentoo.org/proj/java.git/commit/?id=d94b96e1

Merge branch 'master' of git://anongit.gentoo.org/proj/java

 dev-java/icedtea/files/icedtea.env            | 18 ------------------
 dev-java/icedtea/files/icedtea.env.sh         | 18 ++++++++++++++++++
 dev-java/icedtea/icedtea-3.1.0.ebuild         |  2 +-
 dev-java/icedtea/icedtea-6.1.13.11.ebuild     |  2 +-
 dev-java/icedtea/icedtea-6.9999.ebuild        |  2 +-
 dev-java/icedtea/icedtea-7.2.6.7.ebuild       |  5 +++--
 dev-java/icedtea/icedtea-7.2.7.0_pre05.ebuild |  5 +++--
 7 files changed, 27 insertions(+), 25 deletions(-)