# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1275056692 -3600
# Node ID b9e98a1244ee120b5513e54e59ffc097e1606f4d
# Parent  23b59305592decf17e242996e9553c7a17e6cdb8# Parent  593fb613234eef99efde3e85ebbed6a8cf97462d
Re-merge fix for bug 2611

diff -r 23b59305592d -r b9e98a1244ee networkingtestandutils/networkingintegrationtest/Group/IntegrationTestUtils.mmp
--- a/networkingtestandutils/networkingintegrationtest/Group/IntegrationTestUtils.mmp	Tue May 25 14:22:18 2010 +0300
+++ b/networkingtestandutils/networkingintegrationtest/Group/IntegrationTestUtils.mmp	Fri May 28 15:24:52 2010 +0100
@@ -34,7 +34,9 @@
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 LIBRARY     	euser.lib efsrv.lib 
-LIBRARY		cinidata.lib
+// darios: cinidata is deprecated, see bug #1894
+//LIBRARY		cinidata.lib
+LIBRARY		IniParser.lib
 
 epocheapsize  1000 6000000
 CAPABILITY All -Tcb
diff -r 23b59305592d -r b9e98a1244ee networkingtestandutils/networkingintegrationtest/inc/TestStep.h
--- a/networkingtestandutils/networkingintegrationtest/inc/TestStep.h	Tue May 25 14:22:18 2010 +0300
+++ b/networkingtestandutils/networkingintegrationtest/inc/TestStep.h	Fri May 28 15:24:52 2010 +0100
@@ -26,7 +26,9 @@
 #if (!defined __TESTSTEP_H__)
 #define __TESTSTEP_H__
 
-#include "cinidata.h"
+// darios: cinidata is deprecated, see bug #1894
+//#include "cinidata.h"
+#include <iniparser.h>
 #include "networking/log.h"
 
 class CTestSuite;