projects / vuplus_dvbapp / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4186f8c baf0a59)
Merge branch 'experimental' into vuplus_sum_exper
authorikseong <ikseong@vuplus>
Tue, 29 Jun 2010 10:06:17 +0000 (19:06 +0900)
committerikseong <ikseong@vuplus>
Tue, 29 Jun 2010 10:06:17 +0000 (19:06 +0900)
commitd4a487ead0f0a70be38632e8a094e87c06daf903
tree634381e44a9bb66ea9aef1323e55307cfcc85935tree | snapshot
parent4186f8c308d9450353520a88eb5a5ee3940281d3commit | diff
parentbaf0a59fa2538724a343aac0082b55d0ac591120commit | diff
Merge branch 'experimental' into vuplus_sum_exper

Conflicts:

lib/dvb/epgcache.cpp
lib/dvb/frontend.cpp
lib/dvb/idvb.h
lib/gdi/lcd.cpp
lib/python/Components/Converter/TemplatedMultiContent.py
lib/python/Components/NimManager.py
lib/python/Components/Renderer/Listbox.py
lib/python/Screens/Satconfig.py
lib/python/Screens/ServiceScan.py
lib/python/Screens/Subtitles.py
po/nl.po
14 files changed:
RecordTimer.py diff1 | diff2 | blob | history
configure.ac diff1 | diff2 | blob | history
data/menu.xml diff1 | diff2 | blob | history
data/skin.xml diff1 | diff2 | blob | history
lib/dvb/dvb.cpp diff1 | diff2 | blob | history
lib/dvb/frontend.cpp diff1 | diff2 | blob | history
lib/gdi/font.cpp diff1 | diff2 | blob | history
lib/gdi/glcddc.cpp diff1 | diff2 | blob | history
lib/gdi/lcd.cpp diff1 | diff2 | blob | history
lib/python/Plugins/Extensions/MediaPlayer/plugin.py diff1 | diff2 | blob | history
lib/python/Screens/InfoBarGenerics.py diff1 | diff2 | blob | history
lib/python/Screens/NetworkSetup.py diff1 | diff2 | blob | history
lib/python/Screens/ServiceScan.py diff1 | diff2 | blob | history
lib/python/enigma_python.i diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.