Merge branch 'master' of http://192.168.102.71/openvuplus
authorkos <kos@dev3>
Tue, 11 Dec 2012 05:33:09 +0000 (14:33 +0900)
committerkos <kos@dev3>
Tue, 11 Dec 2012 05:33:09 +0000 (14:33 +0900)
commit462d73d2987416bb23b756e4379a1c830e925604
tree7676a7ac20c073bc7fb7d56b30b21f44f89febb8
parent42f0cc9ac2256e062368452f98b9db4b62ae8359
parentf62149ebafebc2bc0c434b320433e0f1e0daf756
Merge branch 'master' of 192.168.102.71/openvuplus

Conflicts:
meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc
meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc