Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: /
Date: Fri, 31 May 2013 15:31:24
Message-Id: 1369917532.26016e555ed9984a25031840207b3150eb26a593.kensington@gentoo
commit:     26016e555ed9984a25031840207b3150eb26a593
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu May 30 12:38:52 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu May 30 12:38:52 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=26016e55

Merge branch 'master' into no-semantic-desktop

Conflicts:
	media-sound/amarok/amarok-2.7.1.ebuild


 media-sound/amarok/Manifest            |   1 -
 media-sound/amarok/amarok-2.7.1.ebuild | 129 ---------------------------------
 2 files changed, 130 deletions(-)