From: schon <schon@dev03-server>
Date: Thu, 27 Jan 2011 01:15:34 +0000 (+0900)
Subject: Merge commit 'dm/experimental' into test_0127
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=7407ccb796e6079fee5d010aceab5e6c606faf01

Merge commit 'dm/experimental' into test_0127
---

7407ccb796e6079fee5d010aceab5e6c606faf01
diff --cc lib/dvb/dvb.cpp
index 68197c3,cd6c232..fbca6f3
mode 100755,100644..100755
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
diff --cc lib/python/Screens/InfoBar.py
index 3481177,5506287..860022a
mode 100755,100644..100755
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py