diff options
| author | acid-burn <acid-burn@opendreambox.org> | 2010-10-08 11:45:50 +0200 |
|---|---|---|
| committer | acid-burn <acid-burn@opendreambox.org> | 2010-10-08 11:45:50 +0200 |
| commit | 5f60d706ff61b12a54b4ca0cd94d0cd9cb131404 (patch) | |
| tree | 08dc69b79dcbb050b52cb6f3b1969991ee9a340a /lib/python/Plugins/Extensions | |
| parent | 88e31943f018bc4ba2d7b63bafb8f9129114877a (diff) | |
| download | enigma2-5f60d706ff61b12a54b4ca0cd94d0cd9cb131404.tar.gz enigma2-5f60d706ff61b12a54b4ca0cd94d0cd9cb131404.zip | |
meta/plugin_graphmultiepg.xml: fix merge conflict
Diffstat (limited to 'lib/python/Plugins/Extensions')
| -rwxr-xr-x | lib/python/Plugins/Extensions/GraphMultiEPG/meta/plugin_graphmultiepg.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/python/Plugins/Extensions/GraphMultiEPG/meta/plugin_graphmultiepg.xml b/lib/python/Plugins/Extensions/GraphMultiEPG/meta/plugin_graphmultiepg.xml index 37d09889..d3a2edf8 100755 --- a/lib/python/Plugins/Extensions/GraphMultiEPG/meta/plugin_graphmultiepg.xml +++ b/lib/python/Plugins/Extensions/GraphMultiEPG/meta/plugin_graphmultiepg.xml @@ -7,7 +7,7 @@ <author>Dream Multimedia</author> <name>GraphMultiEPG</name> <packagename>enigma2-plugin-extensions-graphmultiepg</packagename> - <shortdescription>GraphMultiEPG shows a graphical timeline EPG</shortdescription> + <shortdescription>GraphMultiEPG shows a graphical timeline EPG</shortdescription> <description>GraphMultiEPG shows a graphical timeline EPG.\nShows a nice overview of all running und upcoming tv shows.</description> <screenshot src="http://www.dreamboxupdate.com/preview/plugin_graphmultiepg_en.jpg" /> </info> |