summaryrefslogtreecommitdiff
path: root/packages/opie-clockapplet
diff options
context:
space:
mode:
authorTom Rini <trini@embeddedalley.com>2009-01-27 18:03:07 -0500
committerTom Rini <trini@embeddedalley.com>2009-01-27 18:03:07 -0500
commit2ae4d66192f2db96bbd79ddcc33e6aac7c1bd960 (patch)
tree11a2c7c90703d8034d755297e156b420c075c8e7 /packages/opie-clockapplet
parentffee230ed0b6c49ef4a0b23bc850b843c429f19a (diff)
parent04c9615b938eaabfbadc99c1707eb44657c95a61 (diff)
Merge trini/canadian-merge branch into org.openembedded.dev, fixup a
conflict on checksums.ini
Diffstat (limited to 'packages/opie-clockapplet')
0 files changed, 0 insertions, 0 deletions