projects
/
vuplus_dvbapp
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7e24510
8a1d65c
)
Merge remote branch 'origin/bug_596_dvdburn_audiotrackorder' into experimental
author
Fraxinas
<andreas.frisch@multimedia-labs.de>
Fri, 8 Oct 2010 10:01:44 +0000
(12:01 +0200)
committer
Fraxinas
<andreas.frisch@multimedia-labs.de>
Fri, 8 Oct 2010 10:01:44 +0000
(12:01 +0200)
Conflicts:
data/skin_default/icons/Makefile.am
lib/python/Plugins/Extensions/GraphMultiEPG/meta/plugin_graphmultiepg.xml
Trivial merge