summaryrefslogtreecommitdiff
path: root/conf/checksums.ini
diff options
context:
space:
mode:
authorMichael 'Mickey' Lauer <mickey@vanille-media.de>2009-03-02 19:09:19 +0100
committerMichael 'Mickey' Lauer <mickey@vanille-media.de>2009-03-02 19:09:19 +0100
commitdd53c790d6c3b19bff547755f804e5f2fccc56ed (patch)
tree592f015c44735d719e52f57c86533cbf6981ca14 /conf/checksums.ini
parent6be41f1374dc9bf7f53673273d8b02bfbfe6a02e (diff)
parentb765ebc700bd5b639f70ccf2268284be624f46df (diff)
Merge branch 'mickey/org.openembedded.dev' into org.openembedded.dev
Conflicts: classes/qt4e.bbclass packages/bluez/bluez4_4.31.bb packages/mc/mc_4.6.2.bb packages/vte/vte.inc packages/vte/vte_0.16.13.bb packages/vte/vte_0.16.14.bb
Diffstat (limited to 'conf/checksums.ini')
0 files changed, 0 insertions, 0 deletions