From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Thu, 25 Feb 2016 21:51:35 +0000 (+0000)
Subject: Merge branch 'master' of ssh://digit.mahou.co.uk/home/kirinji/repos/xestiacal
X-Git-Tag: release-0.02~343
X-Git-Url: http://Server1/repobrowser/?a=commitdiff_plain;h=b776fb87f9406910f146cd935605b0e505943142;hp=-c;p=xestiacalendar%2F.git

Merge branch 'master' of ssh://digit.mahou.co.uk/home/kirinji/repos/xestiacal
---

b776fb87f9406910f146cd935605b0e505943142
diff --combined source/tests/xestiacalendar_testcommon.h
index 739bd64,ab30396..363b9b8
--- a/source/tests/xestiacalendar_testcommon.h
+++ b/source/tests/xestiacalendar_testcommon.h
@@@ -3,7 -3,6 +3,7 @@@
  
  #include "../objects/CalDAV/CalDAV.h"
  #include <string>
 +#include <stdexcept>
  
  using namespace std;
  
@@@ -11,7 -10,8 +11,8 @@@ enum ProcessConnectionDataFileResult
  	PROCESSCONNECTIONDATAFILE_UNITTESTFAIL = -1,
  	PROCESSCONNECTIONDATAFILE_OK,
  	PROCESSCONNECTIONDATAFILE_MISSING,
- 	PROCESSCONNECTIONDATAFILE_CANNOTOPEN
+ 	PROCESSCONNECTIONDATAFILE_CANNOTOPEN,
+ 	PROCESSCONNECTIONDATAFILE_INVALID
  };
  
  ProcessConnectionDataFileResult ProcessConnectionDataFile(string DataFilename,