diff options
| author | hschang <chang@dev3> | 2014-11-21 05:08:01 (GMT) |
|---|---|---|
| committer | hschang <chang@dev3> | 2014-11-21 05:08:01 (GMT) |
| commit | 89fe5e2d4ab32d17585aaf80418c7d31ed559a14 (patch) | |
| tree | c0b6470d555f1ec36ec54aeca7ce3bd48a73e71f /openembedded-core | |
| parent | d79918a4bef758142074ba69a93edf029ab3cdf7 (diff) | |
| parent | 6907ca5bf3e3580f17748e8c7cf2ff218c0e613c (diff) | |
Merge remote-tracking branch 'OE-2.1/master' into vuplus-3.0
Conflicts:
meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif.bb
Diffstat (limited to 'openembedded-core')
0 files changed, 0 insertions, 0 deletions