diff options
| author | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-04-23 10:29:41 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-04-23 10:29:41 +0000 |
| commit | b07a4adc0ca8dd17e9ed2999ed0780a67535acfe (patch) | |
| tree | 20b268c79c5e358d4786f588c7a18b801bcfd6ed /meta | |
| parent | ff2e381fd7fb8db0c13382ecf968bb6cb100e88a (diff) | |
| download | openembedded-core-b07a4adc0ca8dd17e9ed2999ed0780a67535acfe.tar.gz openembedded-core-b07a4adc0ca8dd17e9ed2999ed0780a67535acfe.tar.bz2 openembedded-core-b07a4adc0ca8dd17e9ed2999ed0780a67535acfe.zip | |
xserver-kdrive: mark merged patches
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4318 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb b/meta/packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb index 8ae7f6b888..611c94c50a 100644 --- a/meta/packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb +++ b/meta/packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb @@ -13,7 +13,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ file://no-serial-probing.patch;patch=1 \ file://fbdev-not-fix.patch;patch=1 \ file://optional-xkb.patch;patch=1 \ - file://enable-tslib.patch;patch=1 \ + file://enable-tslib.patch;patch=1;merged \ file://kmode-palm.patch;patch=1 \ file://enable-epson.patch;patch=1 \ file://fix_default_mode.patch;patch=1 \ @@ -25,12 +25,12 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ file://w100-new-input-world-order.patch;patch=1 \ file://linux-keyboard-mediumraw.patch;patch=1 \ file://xcalibrate-new-input-world-order.patch;patch=1 \ - file://tslib-default-device.patch;patch=1 \ + file://tslib-default-device.patch;patch=1;merged \ # file://fbdev-evdev.patch;patch=1 \ file://keyboard-resume-workaround.patch;patch=1 \ - file://xorg-avr32-support.diff;patch=1 \ + file://xorg-avr32-support.diff;patch=1;merged \ # file://pkgconfig_fix.patch;patch=1 \ - file://no_xkb.patch;patch=1;pnum=0 \ + file://no_xkb.patch;patch=1;pnum=0;merged \ " S = "${WORKDIR}/xorg-server-${PV}" |