projects / vuplus_dvbapp / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3c8f046 67085f6)
Merge branch 'master' into experimental
authorStefan Pluecken <stefan.pluecken@multimedia-labs.de>
Fri, 6 Nov 2009 17:17:22 +0000 (18:17 +0100)
committerStefan Pluecken <stefan.pluecken@multimedia-labs.de>
Fri, 6 Nov 2009 17:17:22 +0000 (18:17 +0100)
Conflicts:
lib/python/Components/config.py

1  2 
lib/python/Components/NimManager.py patch | diff1 | diff2 | blob | history
lib/python/Components/config.py patch | diff1 | diff2 | blob | history

diff --cc lib/python/Components/NimManager.py
Simple merge
diff --cc lib/python/Components/config.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.