projects / vuplus_dvbapp / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ef8469a 3b990b5)
Merge commit 'origin/bug_578_translateable_meta_descriptions'
authoracid-burn <acid-burn@opendreambox.org>
Tue, 5 Oct 2010 11:00:54 +0000 (13:00 +0200)
committeracid-burn <acid-burn@opendreambox.org>
Tue, 5 Oct 2010 11:00:54 +0000 (13:00 +0200)
commitbe8ccc9f63c4cd79f8dba84087c7348c23657865
treee45dcc397e7ef5e39a64fbd19d74268ab3650a40tree | snapshot
parentef8469a63bbe601f4e1ac0bb68226e25070a1ce4commit | diff
parent3b990b579c3f4211994b91ea60f3d9f868ac065acommit | diff
Merge commit 'origin/bug_578_translateable_meta_descriptions'

Conflicts:
lib/python/Plugins/Extensions/GraphMultiEPG/meta/plugin_graphmultiepg.xml
lib/python/Plugins/SystemPlugins/SoftwareManager/SoftwareTools.py diff1 | diff2 | blob | history
lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.