git.cweiske.de
/
enigma2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
547ecaf
bb29875
)
Merge commit 'origin/bug_383_softwaremanager' into experimental
author
acid-burn
<
[email protected]
>
Tue, 19 Jan 2010 07:35:27 +0000
(08:35 +0100)
committer
acid-burn
<
[email protected]
>
Tue, 19 Jan 2010 07:35:27 +0000
(08:35 +0100)
Conflicts:
lib/python/Plugins/Extensions/MediaPlayer/plugin.py
Trivial merge
git.cweiske.de / enigma2.git / commitdiff