public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/x11:multilib commit in: /
@ 2013-01-21 22:37 Michał Górny
  0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2013-01-21 22:37 UTC (permalink / raw
  To: gentoo-commits

commit:     f6a8973c5402c8fd9417eff6c85e58624a4a4963
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 21 22:37:58 2013 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jan 21 22:37:58 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=f6a8973c

Merge branch 'multilib' of ssh://pomiot/var/lib/layman/x11 into multilib

Conflicts:
	app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20121202-r1.ebuild
	x11-libs/libXft/libXft-9999-r1.ebuild


 .../emul-linux-x86-xlibs-20121202-r1.ebuild        |   60 +++++-----
 media-libs/fontconfig/Manifest                     |    1 +
 .../files/fontconfig-2.3.2-docbook.patch           |   15 +++
 .../files/fontconfig-2.7.1-latin-reorder.patch     |   50 ++++++++
 media-libs/fontconfig/fontconfig-2.9.0-r1.ebuild   |  126 ++++++++++++++++++
 media-libs/freetype/Manifest                       |    4 +
 .../files/freetype-2.3.2-enable-valid.patch        |   22 ++++
 media-libs/freetype/freetype-2.4.10-r2.ebuild      |  133 ++++++++++++++++++++
 x11-libs/libXft/libXft-9999-r1.ebuild              |   16 +--
 x11-libs/libvdpau/libvdpau-0.5-r1.ebuild           |    3 +-
 ...9999.ebuild => xf86bigfontproto-9999-r1.ebuild} |    2 +
 11 files changed, 388 insertions(+), 44 deletions(-)


^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] proj/x11:multilib commit in: /
@ 2013-01-21 22:37 Michał Górny
  0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2013-01-21 22:37 UTC (permalink / raw
  To: gentoo-commits

commit:     b0019b8c4eb489f4d4b14d4a2124fff0d5f4e7ae
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 21 22:37:03 2013 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jan 21 22:37:03 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=b0019b8c

Merge remote-tracking branch 'pomiot/multilib' into multilib

Conflicts:
	eclass/xorg-2.eclass



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2013-01-21 22:37 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-21 22:37 [gentoo-commits] proj/x11:multilib commit in: / Michał Górny
  -- strict thread matches above, loose matches on Subject: below --
2013-01-21 22:37 Michał Górny

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox