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 1CD70138CDD for ; Sat, 6 Jun 2015 17:43:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A161BE08B1; Sat, 6 Jun 2015 17:43:41 +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 D029CE08AE for ; Sat, 6 Jun 2015 17:43:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 299373404B1 for ; Sat, 6 Jun 2015 17:43:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6CCD6A30 for ; Sat, 6 Jun 2015 17:43:37 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1433612593.fd306a022408507321cb683d91654e3eb761985f.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: sets/ X-VCS-Repository: proj/kde X-VCS-Files: sets/kdebase-15.04:4 sets/kdepim-15.04:4 X-VCS-Directories: sets/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: fd306a022408507321cb683d91654e3eb761985f X-VCS-Branch: master Date: Sat, 6 Jun 2015 17:43:37 +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: 2380f978-351f-4322-a9fb-399a3bcee2ef X-Archives-Hash: 855a08fc47a5669fca1c0a01fa6f9fbf commit: fd306a022408507321cb683d91654e3eb761985f Author: Andreas Sturmlechner gmail com> AuthorDate: Sat Jun 6 12:04:26 2015 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Sat Jun 6 17:43:13 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=fd306a02 [sets] Add kdepim-15.04:4, fix kdebase-15.04:4 kdepim-15.04:4 is just 4.14 minus kde-base/kdepim-l10n, fixes conflict with kde-apps/kde4-l10n-15.04.x sets/kdebase-15.04:4 | 4 ++-- sets/kdepim-15.04:4 | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/sets/kdebase-15.04:4 b/sets/kdebase-15.04:4 index 2083263..0cb3725 100644 --- a/sets/kdebase-15.04:4 +++ b/sets/kdebase-15.04:4 @@ -1,4 +1,4 @@