Gentoo Archives: gentoo-commits

From:	Michael Palimaka <kensington@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] proj/kde:no-semantic-desktop commit in: /
Date:	Thu, 30 May 2013 12:41:44
Message-Id:	`1369917532.26016e555ed9984a25031840207b3150eb26a593.kensington@gentoo`

1	commit: 26016e555ed9984a25031840207b3150eb26a593
2	Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3	AuthorDate: Thu May 30 12:38:52 2013 +0000
4	Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5	CommitDate: Thu May 30 12:38:52 2013 +0000
6	URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=26016e55
7
8	Merge branch 'master' into no-semantic-desktop
9
10	Conflicts:
11	media-sound/amarok/amarok-2.7.1.ebuild
12
13
14	media-sound/amarok/Manifest \| 1 -
15	media-sound/amarok/amarok-2.7.1.ebuild \| 129 ---------------------------------
16	2 files changed, 130 deletions(-)