mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 17:19:20 +00:00
Code Issues Projects Releases Wiki Activity

openmoko-today2-folders: fix conflicts as we moved some components of Sato desktop

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4921 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Marcin Juszkiewicz
2008-07-22 11:25:10 +00:00
parent 686752960b
commit fc6fd10ff9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-openmoko/packages/openmoko2/openmoko-today2-folders_svn.bb
+2 -2
View File
@@ -1,8 +1,8 @@
DESCRIPTION = "The Openmoko Today2 vfolder files"
SECTION = "openmoko/misc"
PV = "0.1.0+svnr${SRCREV}"
PR = "r3"
RCONFLICTS_${PN} = "matchbox-common"
PR = "r4"
RCONFLICTS_${PN} = "matchbox-desktop-sato"
inherit openmoko2