[oe-commits] org.oe.dev merge of '751075256c107f73ba206ce1dd071de65d4d33c4'

Mon Sep 1 17:57:36 UTC 2008

merge of '751075256c107f73ba206ce1dd071de65d4d33c4'
     and '9b0c628cc38533c1bd3c58efadccbe831221b079'

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 118d2fe341bdfe0ddb212e159f3b42130b3da8da
ViewMTN: http://monotone.openembedded.org/revision/info/118d2fe341bdfe0ddb212e159f3b42130b3da8da
Files:
1
packages/xorg-font/xorg-minimal-fonts
packages/xorg-font/xorg-minimal-fonts/misc
packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-1.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-10.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-11.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-13.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-14.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-15.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-16.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-2.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-3.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-4.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-5.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-7.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-8.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-9.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13-KOI8-R.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-1.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-10.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-13.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-14.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-15.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-16.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-2.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-3.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-4.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-5.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-7.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-8.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-9.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13B.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-1.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-10.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-13.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-14.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-15.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-16.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-2.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-3.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-4.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-5.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-7.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-9.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13O.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/cursor.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/fonts.alias
packages/xorg-font/xorg-minimal-fonts/misc/fonts.dir
packages/xorg-font/xorg-minimal-fonts.bb
packages/images/beagleboard-demo-image.bb
packages/xorg-xserver/xorg-xserver-common.inc
packages/xorg-xserver/xserver-xorg/xorg.conf
packages/xorg-xserver/xserver-xorg_1.4.2.bb
packages/xorg-xserver/xserver-xorg_1.4.bb
mtn:manual_merge
true
packages/linux/linux-kaiser_2.6.24+git.bb
Diffs:

#
# mt diff -r751075256c107f73ba206ce1dd071de65d4d33c4 -r118d2fe341bdfe0ddb212e159f3b42130b3da8da
#
#
#
# add_dir "packages/xorg-font/xorg-minimal-fonts"
# 
# add_dir "packages/xorg-font/xorg-minimal-fonts/misc"
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-1.pcf.gz"
#  content [429c6b61382bd539052d61e0e492ff06351d415c]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-10.pcf.gz"
#  content [db8ecae135e0d092c20091c93dbd96a8e241ea8c]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-11.pcf.gz"
#  content [05488b45cf91e6fc2583fb970317d3ff62b07e4e]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-13.pcf.gz"
#  content [44a1121639c0366043e14b57614197e456cbdade]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-14.pcf.gz"
#  content [3beb6a9f8e524c1caeeef4b119a1fd932431be01]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-15.pcf.gz"
#  content [b68f5991e595ba87974d5b2a2a348e9a41f31ff6]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-16.pcf.gz"
#  content [5a8f30aa3a84090edd9d9970138f8518ad52ea42]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-2.pcf.gz"
#  content [f39689a63574d53673ce145236b793a8fb74eb86]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-3.pcf.gz"
#  content [ce0483714796cf32b129e2942ce43bd90616018c]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-4.pcf.gz"
#  content [1c7c5ebaaec6677141f849f5645a159e9b5ae6c5]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-5.pcf.gz"
#  content [b9a2401a4204bb8e3eb7eab6ceab34cfa84b0b78]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-7.pcf.gz"
#  content [aa16398f10c3db5d484643953c24712c8560292c]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-8.pcf.gz"
#  content [d664e50af10cda6de4fe527c64ec4c1ee4d2681d]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-9.pcf.gz"
#  content [1b80980bf41f523d19329a8aeea8b34d5ffcbf0e]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13-KOI8-R.pcf.gz"
#  content [903b975d18174204adc7edd8aefdeb450b11e5e2]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13.pcf.gz"
#  content [31be221a15a70ae08c27b7f90d960b4134989b13]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-1.pcf.gz"
#  content [1770b1947e0b38dd824efd94a1822ee837a55a8d]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-10.pcf.gz"
#  content [34646b988ede3dd8b014b3c95a6b48797947f5ac]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-13.pcf.gz"
#  content [0f16a79b6100b05944a24e44dd6c30236993a7cb]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-14.pcf.gz"
#  content [8e3f20be3888b366abfa6969307ddcd5f8cbe979]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-15.pcf.gz"
#  content [2d5905c96babfa884e27d2c3a6cd242fbda13808]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-16.pcf.gz"
#  content [3e0f5a2204c8b6abb4438121599aa4e919ce3e98]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-2.pcf.gz"
#  content [8a01078bf324b72895e5382b2131cf4e2320dcd8]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-3.pcf.gz"
#  content [984c0734cf03f8cfcd639ca58e1853b30bc11c64]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-4.pcf.gz"
#  content [65e8f70706059874a7f3636de1309872121d51ef]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-5.pcf.gz"
#  content [e19a28316eb5d9f5ddea50bd251a6096cc9ed80c]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-7.pcf.gz"
#  content [c99d4b1acc34525c5b3edc8934055f20993d8734]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-8.pcf.gz"
#  content [8171a73bd899c977a45be7911e3447ff359fd7ab]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-9.pcf.gz"
#  content [5ddf8d8f0687adee0cdf59d72197637bf8b3ffe4]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13B.pcf.gz"
#  content [49b9cd3f8ab1f85617d802849bb1a9659be523c5]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-1.pcf.gz"
#  content [91c33f543dbdd6cd0f501c56f99442ca00350a4e]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-10.pcf.gz"
#  content [2aa33281920e9cdbaf75be8ae349734790f405a4]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-13.pcf.gz"
#  content [d28f0501a4a2c34b5dbd6c280b0928ba0bb0eb4e]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-14.pcf.gz"
#  content [7b4de156dfe17c3f8b85d4890b98236d616ab7a9]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-15.pcf.gz"
#  content [9bb679311df33d678ad0c7d90a3388c97dd07db6]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-16.pcf.gz"
#  content [8b71f81331c1732338fb00db4177df7b72f90d62]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-2.pcf.gz"
#  content [6b2fe6ae191a51600ebd3a3f990bb8d87e5874d5]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-3.pcf.gz"
#  content [7442f1b4431b7d3608ae143117e241eec026b424]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-4.pcf.gz"
#  content [d917ba3a15f4d6cc6818e7b58af42e42ade5ab1b]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-5.pcf.gz"
#  content [a00b42e132501f6495fabaf610b97bb93d426de9]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-7.pcf.gz"
#  content [f8d0bd0a06ce0f3781a88f44caccb5ad12716b6e]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-9.pcf.gz"
#  content [4ea48ceada126e28020ea6065119328c4d518aec]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13O.pcf.gz"
#  content [a0a2722378df5eceb96bd35710505b7b1adc6b7e]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/cursor.pcf.gz"
#  content [8b58c81f468ac66f1b69e2093abb140db026d499]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/fonts.alias"
#  content [1233785d59e32e65a1dc9fdab5ee10df3b1b8d5c]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/fonts.dir"
#  content [cce53ac2ae8af5bd5dde9078f46422a8160c00e5]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts.bb"
#  content [ead866f55cd01c842a77f7f3b8bf058f7592737f]
# 
# patch "packages/images/beagleboard-demo-image.bb"
#  from [a331c7d784384394318bb658ab691ae57a70156d]
#    to [875f52bc04fa435e0094cca30271d8473da6cf36]
# 
# patch "packages/xorg-xserver/xorg-xserver-common.inc"
#  from [1cc605fc952cb675700394a0e68ce0f8c83f5d6f]
#    to [dc8d79997ec36fdb922741dc4c5ae140970f9e12]
# 
# patch "packages/xorg-xserver/xserver-xorg/xorg.conf"
#  from [067fe1120fc0e93fa9c0e580a748ab38ad9a52c7]
#    to [bfcc63810ece1d786706fcb229fa67ac029b54d2]
# 
# patch "packages/xorg-xserver/xserver-xorg_1.4.2.bb"
#  from [82f378de1913460628054471e7fd0daca8a411a1]
#    to [aa88c8fb589cdbefddf67d5801f17ec2980d02e9]
# 
# patch "packages/xorg-xserver/xserver-xorg_1.4.bb"
#  from [aa88c8fb589cdbefddf67d5801f17ec2980d02e9]
#    to [4390a6545e73aa1015da701f862ee96c21cca2b6]
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-1.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-10.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-11.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-13.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-14.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-15.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-16.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-2.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-3.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-4.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-5.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-7.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-8.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-9.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13-KOI8-R.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-1.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-10.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-13.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-14.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-15.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-16.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-2.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-3.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-4.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-5.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-7.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-8.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-9.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13B.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-1.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-10.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-13.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-14.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-15.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-16.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-2.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-3.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-4.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-5.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-7.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-9.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13O.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/cursor.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
#
============================================================
# packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-1.pcf.gz is binary
============================================================
# packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-10.pcf.gz is binary
============================================================
# packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-11.pcf.gz is binary
============================================================
# packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-13.pcf.gz is binary
============================================================
# packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-14.pcf.gz is binary
============================================================
# packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-15.pcf.gz is binary
============================================================
# packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-16.pcf.gz is binary
============================================================
# packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-2.pcf.gz is binary
============================================================
# packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-3.pcf.gz is binary
============================================================
# packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-4.pcf.gz is binary
============================================================
# packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-5.pcf.gz is binary
============================================================
# packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-7.pcf.gz is binary
============================================================
# packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-8.pcf.gz is binary
============================================================
# packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-9.pcf.gz is binary
============================================================
# packages/xorg-font/xorg-minimal-fonts/misc/6x13-KOI8-R.pcf.gz is binary
============================================================
# packages/xorg-font/xorg-minimal-fonts/misc/6x13.pcf.gz is binary
============================================================
# packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-1.pcf.gz is binary
============================================================
# packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-10.pcf.gz is binary
============================================================
# packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-13.pcf.gz is binary
============================================================
# packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-14.pcf.gz is binary
============================================================
# packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-15.pcf.gz is binary
============================================================
# packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-16.pcf.gz is binary
============================================================
# packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-2.pcf.gz is binary
============================================================
# packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-3.pcf.gz is binary
============================================================
# packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-4.pcf.gz is binary
============================================================
# packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-5.pcf.gz is binary
============================================================
# packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-7.pcf.gz is binary
============================================================
# packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-8.pcf.gz is binary
===================%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -r9b0c628cc38533c1bd3c58efadccbe831221b079 -r118d2fe341bdfe0ddb212e159f3b42130b3da8da
#
#
#
# patch "packages/linux/linux-kaiser_2.6.24+git.bb"
#  from [179f47a7546391b82d05471702ef85d5ff831bc9]
#    to [3846f7ed91c47398672be0e85d09c95c6a15e4ac]
#
============================================================

--- packages/linux/linux-kaiser_2.6.24+git.bb	179f47a7546391b82d05471702ef85d5ff831bc9
+++ packages/linux/linux-kaiser_2.6.24+git.bb	3846f7ed91c47398672be0e85d09c95c6a15e4ac
@@ -3,10 +3,8 @@ PR = "r1"
 PV = "2.6.24+git${SRCREV}"
 PR = "r1"
 
-COMPATIBLE_MACHINE = "htckaiser"
-COMPATIBLE_MACHINE = "htcpolaris"
+COMPATIBLE_MACHINE = "htckaiser|htcpolaris"
 
-
 SRC_URI = "git://git.linuxtogo.org/home/groups/mobile-linux/kernel.git;branch=htc-msm;protocol=git"
 
 S = "${WORKDIR}/git"




