projects / vuplus_dvbapp / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 547ecaf bb29875)
Merge commit 'origin/bug_383_softwaremanager' into experimental
authoracid-burn <acid-burn@opendreambox.org>
Tue, 19 Jan 2010 07:35:27 +0000 (08:35 +0100)
committeracid-burn <acid-burn@opendreambox.org>
Tue, 19 Jan 2010 07:35:27 +0000 (08:35 +0100)
Conflicts:
lib/python/Plugins/Extensions/MediaPlayer/plugin.py


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.