diff options
| author | hschang <chang@dev3> | 2013-01-25 02:19:02 (GMT) |
|---|---|---|
| committer | hschang <chang@dev3> | 2013-01-25 02:19:02 (GMT) |
| commit | b63774d1c5df9933105e4259753ab90350ce4986 (patch) | |
| tree | 6b99d05263e749795b0a97d61e4b8c85f259fc86 /meta-bsp | |
| parent | e3b9992972d51e68b44c1f1f656a8ff9cafcfd79 (diff) | |
| parent | e43a75163d13ee6f8e273275a471e477526cda4c (diff) | |
Merge branch 'master' of code.vuplus.com:/opt/repository/openvuplus
Conflicts:
meta-bsp/vuduo2/conf/machine/vuduo2.conf
meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc
Diffstat (limited to 'meta-bsp')
| -rw-r--r-- | meta-bsp/vuduo2/conf/machine/vuduo2.conf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meta-bsp/vuduo2/conf/machine/vuduo2.conf b/meta-bsp/vuduo2/conf/machine/vuduo2.conf index 8519ce0..d657abe 100644 --- a/meta-bsp/vuduo2/conf/machine/vuduo2.conf +++ b/meta-bsp/vuduo2/conf/machine/vuduo2.conf @@ -13,6 +13,7 @@ MACHINE_FEATURES += "streamtv" MACHINE_FEATURES += "dlna" MACHINE_FEATURES += "3gmodem" MACHINE_FEATURES += "webif" +MACHINE_FEATURES += "autoshutdown" MACHINE_FEATURES += "transcoding" IMAGE_UNPACK_PATH = "vuplus/duo2" |