summaryrefslogtreecommitdiff
path: root/packages/callweaver
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <zecke@selfish.org>2008-11-16 01:09:51 +0100
committerHolger Hans Peter Freyther <zecke@selfish.org>2008-11-16 01:09:51 +0100
commitce81a5820f712888529f7814ae11cce4ce3f6bd9 (patch)
treec6aa834d51accf4f4182bc0c7bfd93247c12607f /packages/callweaver
parent61d929464d8d345d5e0a4d6b1a9955c77f708e3c (diff)
parente13eb6ed3ee15de931a517361ad80f9248798873 (diff)
Merge branch 'holger/openmoko-merges' into org.openembedded.dev
Conflicts: packages/tasks/task-openmoko-feed.bb
Diffstat (limited to 'packages/callweaver')
0 files changed, 0 insertions, 0 deletions