diff options
| author | lvw <lvw@e10066b5-e1e2-0310-b819-94efdf66514b> | 2004-10-09 08:07:30 +0000 |
|---|---|---|
| committer | lvw <lvw@e10066b5-e1e2-0310-b819-94efdf66514b> | 2004-10-09 08:07:30 +0000 |
| commit | 852203bca4fc6b391e6d5533aaec2bfce2a036df (patch) | |
| tree | 4a4d288ac6f4074c047aed1299bee5482220d64c /muggle-plugin/muggle.c | |
| parent | 029b5b014e4b10182fe5a5fd82c2735aedc020d3 (diff) | |
| download | vdr-plugin-muggle-852203bca4fc6b391e6d5533aaec2bfce2a036df.tar.gz vdr-plugin-muggle-852203bca4fc6b391e6d5533aaec2bfce2a036df.tar.bz2 | |
Remove errror in muggle.c
git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk@214 e10066b5-e1e2-0310-b819-94efdf66514b
Diffstat (limited to 'muggle-plugin/muggle.c')
| -rw-r--r-- | muggle-plugin/muggle.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/muggle-plugin/muggle.c b/muggle-plugin/muggle.c index 2adebbb..14ff37b 100644 --- a/muggle-plugin/muggle.c +++ b/muggle-plugin/muggle.c @@ -22,15 +22,7 @@ #include <getopt.h> #include <config.h> -<<<<<<< .mine -<<<<<<< .mine -static const char *VERSION = "0.0.3"; -======= -static const char *VERSION = "0.0.4"; -======= -static const char *VERSION = "0.0.5"; ->>>>>>> .r202 ->>>>>>> .r177 +static const char *VERSION = "0.0.6"; static const char *DESCRIPTION = "Media juggle plugin for VDR"; static const char *MAINMENUENTRY = "Muggle"; |