summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-07-22 11:25:10 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-07-22 11:25:10 +0000
commitfc6fd10ff9cb87af8fd2104c83a578847cd09e44 (patch)
tree8992e3e7bc8ecdc026afd4811e2ae35d9f41457e /meta
parent686752960b509327ffd8777df7f8fc93d66903fe (diff)
downloadopenembedded-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')
0 files changed, 0 insertions, 0 deletions