diff options
| author | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-07-22 11:25:10 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-07-22 11:25:10 +0000 |
| commit | fc6fd10ff9cb87af8fd2104c83a578847cd09e44 (patch) | |
| tree | 8992e3e7bc8ecdc026afd4811e2ae35d9f41457e /meta-openmoko/packages | |
| parent | 686752960b509327ffd8777df7f8fc93d66903fe (diff) | |
| download | openembedded-core-fc6fd10ff9cb87af8fd2104c83a578847cd09e44.tar.gz openembedded-core-fc6fd10ff9cb87af8fd2104c83a578847cd09e44.tar.bz2 openembedded-core-fc6fd10ff9cb87af8fd2104c83a578847cd09e44.tar.xz openembedded-core-fc6fd10ff9cb87af8fd2104c83a578847cd09e44.zip | |
openmoko-today2-folders: fix conflicts as we moved some components of Sato desktop
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4921 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta-openmoko/packages')
| -rw-r--r-- | meta-openmoko/packages/openmoko2/openmoko-today2-folders_svn.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-openmoko/packages/openmoko2/openmoko-today2-folders_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-today2-folders_svn.bb index 4b9f245c3..94b9c45e7 100644 --- a/meta-openmoko/packages/openmoko2/openmoko-today2-folders_svn.bb +++ b/meta-openmoko/packages/openmoko2/openmoko-today2-folders_svn.bb @@ -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 |