git.cweiske.de
/
enigma2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
64d399c
0053213
)
Merge remote-tracking branch 'origin/bug_453_multiepg_no_more_ask_bouquet'
author
ghost
<andreas.monzner@multimedia-labs.de>
Tue, 13 Sep 2011 08:50:43 +0000
(10:50 +0200)
committer
ghost
<andreas.monzner@multimedia-labs.de>
Tue, 13 Sep 2011 08:50:43 +0000
(10:50 +0200)
1
2
data/setup.xml
patch
|
diff1
|
diff2
|
blob
|
history
lib/python/Components/UsageConfig.py
patch
|
diff1
|
diff2
|
blob
|
history
lib/python/Plugins/Extensions/GraphMultiEPG/plugin.py
patch
|
diff1
|
diff2
|
blob
|
history
lib/python/Screens/ChannelSelection.py
patch
|
diff1
|
diff2
|
blob
|
history
lib/python/Screens/InfoBarGenerics.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
data/setup.xml
index 5f7cbf600cbaf51650575b41280cc76e3f83b7f3,93549fa87fa86bb39862f08e5c1dd13cf110648d..862070940e2db329a4ee0a1659b8e91fb0d9cea1
mode 100755,100644..100755
---
1
/
data/setup.xml
---
2
/
data/setup.xml
+++ b/
data/setup.xml
diff --cc
lib/python/Components/UsageConfig.py
Simple merge
diff --cc
lib/python/Plugins/Extensions/GraphMultiEPG/plugin.py
Simple merge
diff --cc
lib/python/Screens/ChannelSelection.py
Simple merge
diff --cc
lib/python/Screens/InfoBarGenerics.py
Simple merge
git.cweiske.de / enigma2.git / commitdiff