# HG changeset patch
# User srilekhas <srilekhas@symbian.org>
# Date 1282564012 -3600
# Node ID 36cc450aad1253fc025fc0744b380720f137195d
# Parent  7e41d162e1580afa0d79e1a7eef2a8717b3ee474# Parent  87bcfc2c9c1ece29ff58f3b796e01201c5af847c
Merge RCL_3 fixes with latest delivery.

diff -r 7e41d162e158 -r 36cc450aad12 linklayercontrol/networkinterfacemgr/group/BLD.INF
--- a/linklayercontrol/networkinterfacemgr/group/BLD.INF	Thu Aug 19 11:25:30 2010 +0300
+++ b/linklayercontrol/networkinterfacemgr/group/BLD.INF	Mon Aug 23 12:46:52 2010 +0100
@@ -94,6 +94,9 @@
 ../inc/cfbearers.h 							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(networking/cfbearers.h)
 #endif // SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
 
+// Bug 3108, required to build sf_refhw image
+NetCfgExtnBase.iby              /epoc32/rom/include/NetCfgExtnBase.iby
+
 PRJ_MMPFILES
 
 NIFMAN.MMP        
diff -r 7e41d162e158 -r 36cc450aad12 networkingtestandutils/networkingintegrationtest/Group/IntegrationTestUtils.mmp
--- a/networkingtestandutils/networkingintegrationtest/Group/IntegrationTestUtils.mmp	Thu Aug 19 11:25:30 2010 +0300
+++ b/networkingtestandutils/networkingintegrationtest/Group/IntegrationTestUtils.mmp	Mon Aug 23 12:46: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 7e41d162e158 -r 36cc450aad12 networkingtestandutils/networkingintegrationtest/inc/TestStep.h
--- a/networkingtestandutils/networkingintegrationtest/inc/TestStep.h	Thu Aug 19 11:25:30 2010 +0300
+++ b/networkingtestandutils/networkingintegrationtest/inc/TestStep.h	Mon Aug 23 12:46: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;