projects / vuplus_dvbapp / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 7e24510 8a1d65c)
Merge remote branch 'origin/bug_596_dvdburn_audiotrackorder' into experimental
authorFraxinas <andreas.frisch@multimedia-labs.de>
Fri, 8 Oct 2010 10:01:44 +0000 (12:01 +0200)
committerFraxinas <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
Unnamed repository; edit this file 'description' to name the repository.