Gentoo Archives: gentoo-commits

From:	Fabian Groffen <grobian@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] proj/portage:prefix commit in: /
Date:	Tue, 02 Oct 2012 12:02:56
Message-Id:	`1349179350.8114c27f4546b23d527ba664e7e532877b710f88.grobian@gentoo`

1	commit: 8114c27f4546b23d527ba664e7e532877b710f88
2	Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3	AuthorDate: Tue Oct 2 12:02:30 2012 +0000
4	Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5	CommitDate: Tue Oct 2 12:02:30 2012 +0000
6	URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=8114c27f
7
8	Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
9
10	Conflicts:
11	bin/ebuild.sh
12
13
14	bin/ebuild.sh \| 4 ++--
15	bin/phase-functions.sh \| 2 ++
16	2 files changed, 4 insertions(+), 2 deletions(-)