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 | 029b5b014e4b10182fe5a5fd82c2735aedc020d3 (patch) | |
| tree | 0e36e66d064598884426c3c5aa332598e78752ef /muggle-plugin/muggle.c | |
| parent | f365422da26d22d56c99d2fcb537e614bcb260e1 (diff) | |
| download | vdr-plugin-muggle-029b5b014e4b10182fe5a5fd82c2735aedc020d3.tar.gz vdr-plugin-muggle-029b5b014e4b10182fe5a5fd82c2735aedc020d3.tar.bz2 | |
Import now avoids duplicate tracks
git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk@213 e10066b5-e1e2-0310-b819-94efdf66514b
Diffstat (limited to 'muggle-plugin/muggle.c')
| -rw-r--r-- | muggle-plugin/muggle.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/muggle-plugin/muggle.c b/muggle-plugin/muggle.c index 849e3eb..2adebbb 100644 --- a/muggle-plugin/muggle.c +++ b/muggle-plugin/muggle.c @@ -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"; |