From: Erik Hovland <erik@hovland.org>
Date: Mon, 15 May 2006 20:48:54 +0000 (+0000)
Subject: merge of 599c09d67423118adcf4ed6ee44637260778ff74
X-Git-Tag: Release-2010-05/1~9453^2~1624^2~1^2~2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c257cb57a9bc7bbbf90310cf592aeaa24cc1960;p=openembedded.git

merge of 599c09d67423118adcf4ed6ee44637260778ff74
     and 8fbc8e73670d1f0b1c156b5be2c15cb389f2128e
---

9c257cb57a9bc7bbbf90310cf592aeaa24cc1960
diff --cc packages/xlibs/libxcomposite_X11R7.0-0.2.2.2.bb
index d3166a99f4,c26f12e5c9..5a911dba85
--- a/packages/xlibs/libxcomposite_X11R7.0-0.2.2.2.bb
+++ b/packages/xlibs/libxcomposite_X11R7.0-0.2.2.2.bb
@@@ -10,5 -10,5 +10,5 @@@ XORG_PN = "libXcomposite
  
  include xorg-xlibs.inc
  
 -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXcomposite-X11R7.0-${PV}.tar.bz2 \
 -	   file://change-include-order.patch;patch=1"
 +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXcomposite-${PV}.tar.bz2 \
- 	   file://change-include-order.patch;patch=1"
++	   file://change-include-order.patch;patch=1"