[oe-commits] org.oe.dev merge of '7f97df68d9bbb4bbdb3287edf727a04a5a29c6a8'

[oe commit]

merge of '7f97df68d9bbb4bbdb3287edf727a04a5a29c6a8'
     and '9a0caec6fe48a6524346d27828894085bf73636d'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 8864b66dc287e4fb2a068ee072346cb529166c42
ViewMTN: http://monotone.openembedded.org/revision/info/8864b66dc287e4fb2a068ee072346cb529166c42
Files:
1
packages/mkfontscale-native_1.0.3.bb
packages/xorg-app/mkfontscale-native_1.0.3.bb
packages/mkfontscale_1.0.3.bb
packages/xorg-app/mkfontscale_1.0.3.bb
packages/linux/linux-rp_2.6.21.bb
Diffs:

#
# mt diff -r7f97df68d9bbb4bbdb3287edf727a04a5a29c6a8 -r8864b66dc287e4fb2a068ee072346cb529166c42
#
# 
# 
# rename "packages/mkfontscale-native_1.0.3.bb"
#     to "packages/xorg-app/mkfontscale-native_1.0.3.bb"
# 
# rename "packages/mkfontscale_1.0.3.bb"
#     to "packages/xorg-app/mkfontscale_1.0.3.bb"
# 


#
# mt diff -r9a0caec6fe48a6524346d27828894085bf73636d -r8864b66dc287e4fb2a068ee072346cb529166c42
#
# 
# 
# patch "packages/linux/linux-rp_2.6.21.bb"
#  from [d80feb79f4ed86271008fb110587f45d2a76a4a8]
#    to [48c008dba96498446b62a8e5235f31358a38d26e]
# 
============================================================
--- packages/linux/linux-rp_2.6.21.bb	d80feb79f4ed86271008fb110587f45d2a76a4a8
+++ packages/linux/linux-rp_2.6.21.bb	48c008dba96498446b62a8e5235f31358a38d26e
@@ -1,7 +1,9 @@ PR = "r10"
 require linux-rp.inc
 
 PR = "r10"
 
+DEFAULT_PREFERENCE_collie = "1"
+
 # Handy URLs
 # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
 # http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2