Merge branch 'experimental' into vuplus_experimental
authorikseong <ikseong@vuplus>
Fri, 16 Jul 2010 02:02:15 +0000 (11:02 +0900)
committerikseong <ikseong@vuplus>
Fri, 16 Jul 2010 02:02:15 +0000 (11:02 +0900)
commitfee5f5b17c9197470c10dfaadbcb0145a5313d54
tree795bcac93be1bdbb31cf2d1c798ad26b1bbadafd
parent4409ad461f5355c31bdf3333b1cccd97f335f793
parent113a3f510100f9b8052eae3519e87dee14cc5d07
Merge branch 'experimental' into vuplus_experimental

Conflicts:

lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
lib/dvb/frontend.cpp
lib/gdi/lcd.cpp
lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py