diff options
| author | lvw <lvw@e10066b5-e1e2-0310-b819-94efdf66514b> | 2004-10-09 08:03:08 +0000 |
|---|---|---|
| committer | lvw <lvw@e10066b5-e1e2-0310-b819-94efdf66514b> | 2004-10-09 08:03:08 +0000 |
| commit | 6cce75232cf142808e21352381e31fe688d2396c (patch) | |
| tree | eda7af17395dec8df528be98b3668f48f8db6f28 /muggle.c | |
| parent | 0793421773dd5740ddf81300b29b42cdb2350382 (diff) | |
| download | vdr-plugin-muggle-6cce75232cf142808e21352381e31fe688d2396c.tar.gz vdr-plugin-muggle-6cce75232cf142808e21352381e31fe688d2396c.tar.bz2 | |
Import now avoids duplicate tracks
git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@213 e10066b5-e1e2-0310-b819-94efdf66514b
Diffstat (limited to 'muggle.c')
| -rw-r--r-- | muggle.c | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -22,7 +22,15 @@ #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 *DESCRIPTION = "Media juggle plugin for VDR"; static const char *MAINMENUENTRY = "Muggle"; |