diff options
| author | schon <schon@dev03-server> | 2012-10-30 07:49:36 (GMT) |
|---|---|---|
| committer | schon <schon@dev03-server> | 2012-10-30 07:49:36 (GMT) |
| commit | aa0e48ea9dd52834e17cd8150925c33e1af565c0 (patch) | |
| tree | 7c182139f8661e3469ce2eaae047ca5c42ef2315 /recipes/linux/linux-vusolo2-3.3.6/vusolo2_defconfig | |
| parent | 33091c58cd1934abc21c029ec78ca68c67bcfe4f (diff) | |
| parent | 29034ef2176a20f6a45481da22d9af029cec8a44 (diff) | |
Merge branch 'vuplus-1.6k_dev' of /home/shcheong/work/stb/sw/oe_1.6/bm750/openembedded into solok336
Conflicts:
recipes/vuplus/vuplus-dvb-modules.bb
Diffstat (limited to 'recipes/linux/linux-vusolo2-3.3.6/vusolo2_defconfig')
0 files changed, 0 insertions, 0 deletions