summaryrefslogtreecommitdiff
path: root/HISTORY.h
diff options
context:
space:
mode:
authorhorchi <vdr@jwendel.de>2017-03-16 19:04:13 +0100
committerhorchi <vdr@jwendel.de>2017-03-16 19:04:13 +0100
commit0420c9193be57b939acc692d50a41c5a48d28e30 (patch)
tree7e12a4123246ee7204e7320201dc916dfab25728 /HISTORY.h
parent62627661d3fc79cdf0a38fc4708a1e88c7285e7a (diff)
parent01c04a4124a98183bd6294d8f52431ff0b2dab45 (diff)
downloadvdr-epg-daemon-0420c9193be57b939acc692d50a41c5a48d28e30.tar.gz
vdr-epg-daemon-0420c9193be57b939acc692d50a41c5a48d28e30.tar.bz2
2017-03-16: version 1.1.108 (horchi)\n - change: Improved error message on failed downloads\n - added: sleep 1 second every 50 scraper downloads due to server limit\n\n
Diffstat (limited to 'HISTORY.h')
-rw-r--r--HISTORY.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/HISTORY.h b/HISTORY.h
index 4d77c45..a36fe4f 100644
--- a/HISTORY.h
+++ b/HISTORY.h
@@ -5,7 +5,11 @@
*/
#define _VERSION "1.1.108"
+<<<<<<< HEAD
#define VERSION_DATE "16.03.2017"
+=======
+#define VERSION_DATE "12.03.2017"
+>>>>>>> 01c04a4124a98183bd6294d8f52431ff0b2dab45
#define DB_API 4
#ifdef GIT_REV
@@ -16,12 +20,19 @@
/*
* ------------------------------------
+<<<<<<< HEAD
2017-03-16: version 1.1.108 (horchi)
- change: Improved error message on failed downloads
- added: sleep 1 second every 50 scraper downloads due to server limit
2017-03-09: version 1.1.107 (rechner)
+=======
+2017-03-12: version 1.1.108 (rechner)
+ - bugfix: namingmode searchtimer shows always 10 instead of template
+
+2017-03-09: version 1.1.106 (rechner)
+>>>>>>> 01c04a4124a98183bd6294d8f52431ff0b2dab45
- bugfix: default namingmode on searchtimer was shown if VDR was stored
2017-03-09: version 1.1.106 (horchi)