From: Marten Richter <marten.richter@freenet.de>
Date: Sun, 13 Jul 2014 12:56:10 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.vomp.tv:20022/vompclient into scraper_support
X-Git-Tag: 0-5-0~77
X-Git-Url: https://git.vomp.tv/gitweb/?a=commitdiff_plain;h=41fcefa88bc4aef0b0968b4a8fa83a7d95f2ad3f;p=vompclient.git

Merge branch 'master' of ssh://git.vomp.tv:20022/vompclient into scraper_support

Conflicts:
	vdr.cc
---

41fcefa88bc4aef0b0968b4a8fa83a7d95f2ad3f
diff --cc vdr.cc
index e8d7043,b44744d..1a3fbac
--- a/vdr.cc
+++ b/vdr.cc
@@@ -37,11 -37,8 +37,10 @@@
  #include "vdrcommand.h"
  #include "video.h"
  #include "osd.h"
 +#include "movieinfo.h"
 +#include "seriesinfo.h"
  
- 
- #define VOMP_PROTOCOLL_VERSION 0x00000302
+ #define VOMP_PROTOCOLL_VERSION 0x00000300
  
  VDR* VDR::instance = NULL;
  //prepare a request