Merge branch 'master' of code.vuplus.com:/opt/repository/openvuplus
authorhschang <chang@dev3>
Fri, 25 Jan 2013 02:19:02 +0000 (11:19 +0900)
committerhschang <chang@dev3>
Fri, 25 Jan 2013 02:19:02 +0000 (11:19 +0900)
commitb63774d1c5df9933105e4259753ab90350ce4986
tree6b99d05263e749795b0a97d61e4b8c85f259fc86
parente3b9992972d51e68b44c1f1f656a8ff9cafcfd79
parente43a75163d13ee6f8e273275a471e477526cda4c
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
meta-bsp/vuduo2/conf/machine/vuduo2.conf
meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc
meta-openvuplus/recipes-vuplus/tasks/task-vuplus-essential.bb