git.cweiske.de
/
enigma2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ef8469a
3b990b5
)
Merge commit 'origin/bug_578_translateable_meta_descriptions'
author
acid-burn
<acid-burn@opendreambox.org>
Tue, 5 Oct 2010 11:00:54 +0000
(13:00 +0200)
committer
acid-burn
<acid-burn@opendreambox.org>
Tue, 5 Oct 2010 11:00:54 +0000
(13:00 +0200)
Conflicts:
lib/python/Plugins/Extensions/GraphMultiEPG/meta/plugin_graphmultiepg.xml
1
2
lib/python/Plugins/SystemPlugins/SoftwareManager/SoftwareTools.py
patch
|
diff1
|
diff2
|
blob
|
history
lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/python/Plugins/SystemPlugins/SoftwareManager/SoftwareTools.py
Simple merge
diff --cc
lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
Simple merge
git.cweiske.de / enigma2.git / commitdiff