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 6380A138B38 for ; Tue, 4 Feb 2014 15:49:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B9ACAE0B17; Tue, 4 Feb 2014 15:49:19 +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 1F828E0B17 for ; Tue, 4 Feb 2014 15:49:19 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 42EEC33F8F8 for ; Tue, 4 Feb 2014 15:49:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id DFECF18876 for ; Tue, 4 Feb 2014 15:49:16 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: <1391529083.8367bc4c903be95b325ccfad51f4909666fe415d.dilfridge@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: / X-VCS-Repository: proj/kde X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: 8367bc4c903be95b325ccfad51f4909666fe415d X-VCS-Branch: master Date: Tue, 4 Feb 2014 15:49:16 +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: 0d4b1067-ff02-43ec-9019-75c2ded2263b X-Archives-Hash: c124db8f8c890df74d933208a393ddf6 commit: 8367bc4c903be95b325ccfad51f4909666fe415d Author: Andreas K. Huettel (dilfridge) gentoo org> AuthorDate: Tue Feb 4 15:51:23 2014 +0000 Commit: Andreas Hüttel gentoo org> CommitDate: Tue Feb 4 15:51:23 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=8367bc4c Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/kde Manually resolve conflicts in package.mask since the 4.12.2 mask was removed in the meantime Conflicts: profiles/package.mask profiles/package.mask.d/kde-4.12.2 net-libs/libbluedevil/Manifest | 1 - net-libs/libbluedevil/libbluedevil-2.0_rc1.ebuild | 21 -- net-wireless/bluedevil/Manifest | 1 - net-wireless/bluedevil/bluedevil-2.0_rc1.ebuild | 31 --- profiles/package.mask | 264 ---------------------- profiles/package.mask.d/kde-4.12.2 | 263 --------------------- 6 files changed, 581 deletions(-)